From ea4ecdf929e9f96753a09ae1bc6db1b6dd826e5e Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 19 Jul 2010 10:48:49 +0000 Subject: [PATCH] --- yaml --- r: 203636 b: refs/heads/master c: d6d9ca0fec6aea0f2e4064474a1c5cdbed873c63 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/sock.c | 5 ++--- trunk/net/sched/sch_generic.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b80b33c46d60..a19cf8943919 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 492c5d943d6a04b124ba3a719dc746dc36b14cfb +refs/heads/master: d6d9ca0fec6aea0f2e4064474a1c5cdbed873c63 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 363bc260157c..b05b9b6ddb87 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -2232,8 +2232,7 @@ static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR); #ifdef CONFIG_NET_NS void sock_prot_inuse_add(struct net *net, struct proto *prot, int val) { - int cpu = smp_processor_id(); - per_cpu_ptr(net->core.inuse, cpu)->val[prot->inuse_idx] += val; + __this_cpu_add(net->core.inuse->val[prot->inuse_idx], val); } EXPORT_SYMBOL_GPL(sock_prot_inuse_add); @@ -2279,7 +2278,7 @@ static DEFINE_PER_CPU(struct prot_inuse, prot_inuse); void sock_prot_inuse_add(struct net *net, struct proto *prot, int val) { - __get_cpu_var(prot_inuse).val[prot->inuse_idx] += val; + __this_cpu_add(prot_inuse.val[prot->inuse_idx], val); } EXPORT_SYMBOL_GPL(sock_prot_inuse_add); diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c index d20fcd2a5519..2aeb3a4386a1 100644 --- a/trunk/net/sched/sch_generic.c +++ b/trunk/net/sched/sch_generic.c @@ -96,7 +96,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, * Another cpu is holding lock, requeue & delay xmits for * some time. */ - __get_cpu_var(softnet_data).cpu_collision++; + __this_cpu_inc(softnet_data.cpu_collision); ret = dev_requeue_skb(skb, q); }