nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: this_cpu_xxx conversions

Browse source 
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>
This commit is contained in:
Eric Dumazet 2010-07-19 10:48:49 +00:00 committed by David S. Miller
parent 492c5d943d
commit d6d9ca0fec
2 changed files with 3 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
net/core/sock.c
View file

@ -2232,8 +2232,7 @@ static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR);
#ifdef CONFIG_NET_NS #ifdef CONFIG_NET_NS
void sock_prot_inuse_add(struct net *net, struct proto *prot, int val) void sock_prot_inuse_add(struct net *net, struct proto *prot, int val)
{ {
int cpu = smp_processor_id(); __this_cpu_add(net->core.inuse->val[prot->inuse_idx], val);
per_cpu_ptr(net->core.inuse, cpu)->val[prot->inuse_idx] += val;
} }
EXPORT_SYMBOL_GPL(sock_prot_inuse_add); 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) 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); EXPORT_SYMBOL_GPL(sock_prot_inuse_add);

2
net/sched/sch_generic.c
View file

@ -96,7 +96,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
* Another cpu is holding lock, requeue & delay xmits for * Another cpu is holding lock, requeue & delay xmits for
* some time. * some time.
*/ */
__get_cpu_var(softnet_data).cpu_collision++; __this_cpu_inc(softnet_data.cpu_collision);
ret = dev_requeue_skb(skb, q); ret = dev_requeue_skb(skb, q);
} }