diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-07-19 12:48:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-20 00:12:51 +0200 |
| commit | d6d9ca0fec6aea0f2e4064474a1c5cdbed873c63 (patch) | |
| tree | 0dcf812c45daf1c79087fc1ac365dcbce2485608 /net | |
| parent | smsc911x: Add spinlocks around registers access (diff) | |
| download | linux-d6d9ca0fec6aea0f2e4064474a1c5cdbed873c63.tar.xz linux-d6d9ca0fec6aea0f2e4064474a1c5cdbed873c63.zip | |
net: this_cpu_xxx conversions
Use modern this_cpu_xxx() api, saving few bytes on x86
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 5 | ||||
| -rw-r--r-- | net/sched/sch_generic.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 363bc260157c..b05b9b6ddb87 100644 --- a/net/core/sock.c +++ b/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/net/sched/sch_generic.c b/net/sched/sch_generic.c index d20fcd2a5519..2aeb3a4386a1 100644 --- a/net/sched/sch_generic.c +++ b/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); } |