From f174bff779089dcb3a79116499f8b77e8587faec Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Tue, 6 Nov 2007 11:33:56 -0800 Subject: [PATCH] cpu alloc: veth conversion Signed-off-by: Christoph Lameter --- drivers/net/veth.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: linux-2.6/drivers/net/veth.c =================================================================== --- linux-2.6.orig/drivers/net/veth.c 2008-04-29 14:55:51.000000000 -0700 +++ linux-2.6/drivers/net/veth.c 2008-05-21 21:48:43.000000000 -0700 @@ -162,7 +162,7 @@ rcv_priv = netdev_priv(rcv); cpu = smp_processor_id(); - stats = per_cpu_ptr(priv->stats, cpu); + stats = CPU_PTR(priv->stats, cpu); if (!(rcv->flags & IFF_UP)) goto outf; @@ -183,7 +183,7 @@ stats->tx_bytes += length; stats->tx_packets++; - stats = per_cpu_ptr(rcv_priv->stats, cpu); + stats = CPU_PTR(rcv_priv->stats, cpu); stats->rx_bytes += length; stats->rx_packets++; @@ -217,7 +217,7 @@ dev_stats->tx_dropped = 0; for_each_online_cpu(cpu) { - stats = per_cpu_ptr(priv->stats, cpu); + stats = CPU_PTR(priv->stats, cpu); dev_stats->rx_packets += stats->rx_packets; dev_stats->tx_packets += stats->tx_packets; @@ -249,7 +249,7 @@ struct veth_net_stats *stats; struct veth_priv *priv; - stats = alloc_percpu(struct veth_net_stats); + stats = CPU_ALLOC(struct veth_net_stats, GFP_KERNEL | __GFP_ZER); if (stats == NULL) return -ENOMEM; @@ -263,7 +263,7 @@ struct veth_priv *priv; priv = netdev_priv(dev); - free_percpu(priv->stats); + CPU_FREE(priv->stats); free_netdev(dev); }