Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
drivers/net/loopback.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: linux-2.6/drivers/net/loopback.c
===================================================================
--- linux-2.6.orig/drivers/net/loopback.c 2007-11-15 21:17:24.067154382 -0800
+++ linux-2.6/drivers/net/loopback.c 2007-11-15 21:25:36.006154068 -0800
@@ -156,7 +156,7 @@ static int loopback_xmit(struct sk_buff
/* it's OK to use per_cpu_ptr() because BHs are off */
pcpu_lstats = netdev_priv(dev);
- lb_stats = per_cpu_ptr(pcpu_lstats, smp_processor_id());
+ lb_stats = THIS_CPU(pcpu_lstats);
lb_stats->bytes += skb->len;
lb_stats->packets++;
@@ -177,7 +177,7 @@ static struct net_device_stats *get_stat
for_each_possible_cpu(i) {
const struct pcpu_lstats *lb_stats;
- lb_stats = per_cpu_ptr(pcpu_lstats, i);
+ lb_stats = CPU_PTR(pcpu_lstats, i);
bytes += lb_stats->bytes;
packets += lb_stats->packets;
}
@@ -205,7 +205,7 @@ static int loopback_dev_init(struct net_
{
struct pcpu_lstats *lstats;
- lstats = alloc_percpu(struct pcpu_lstats);
+ lstats = CPU_ALLOC(struct pcpu_lstats, GFP_KERNEL | __GFP_ZERO);
if (!lstats)
return -ENOMEM;
@@ -217,7 +217,7 @@ static void loopback_dev_free(struct net
{
struct pcpu_lstats *lstats = netdev_priv(dev);
- free_percpu(lstats);
+ CPU_FREE(lstats);
free_netdev(dev);
}
--
-
