Commit d6d9ca0f authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: this_cpu_xxx conversions

Use modern this_cpu_xxx() api, saving few bytes on x86
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 492c5d94
...@@ -2232,8 +2232,7 @@ static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR); ...@@ -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); ...@@ -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);
......
...@@ -96,7 +96,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, ...@@ -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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment