diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-24 00:52:37 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-28 23:24:29 -0700 |
| commit | 7a9b2d59507d85569b8a456688ef40cf2ac73e48 (patch) | |
| tree | 436533da6f680a0b4b6860e0219a2e594ac16735 /net | |
| parent | b6b3ecc71a0664d44ed8d087d583aee98fbf492a (diff) | |
| download | blackbird-op-linux-7a9b2d59507d85569b8a456688ef40cf2ac73e48.tar.gz blackbird-op-linux-7a9b2d59507d85569b8a456688ef40cf2ac73e48.zip | |
net: use this_cpu_ptr()
use this_cpu_ptr(p) instead of per_cpu_ptr(p, smp_processor_id())
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/flow.c | 4 | ||||
| -rw-r--r-- | net/ipv4/ip_input.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index 161900674009..8c7c91a32f18 100644 --- a/net/core/flow.c +++ b/net/core/flow.c @@ -222,7 +222,7 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, unsigned int hash; local_bh_disable(); - fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); + fcp = this_cpu_ptr(fc->percpu); fle = NULL; flo = NULL; @@ -302,7 +302,7 @@ static void flow_cache_flush_tasklet(unsigned long data) LIST_HEAD(gc_list); int i, deleted = 0; - fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); + fcp = this_cpu_ptr(fc->percpu); for (i = 0; i < flow_cache_hash_size(fc); i++) { hlist_for_each_entry_safe(fle, entry, tmp, &fcp->hash_table[i], u.hlist) { diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index db47a5a00ed2..d859bcc26cb7 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -342,7 +342,7 @@ static int ip_rcv_finish(struct sk_buff *skb) #ifdef CONFIG_NET_CLS_ROUTE if (unlikely(skb_dst(skb)->tclassid)) { - struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id()); + struct ip_rt_acct *st = this_cpu_ptr(ip_rt_acct); u32 idx = skb_dst(skb)->tclassid; st[idx&0xFF].o_packets++; st[idx&0xFF].o_bytes += skb->len; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index d5f84bd5a455..4e6ddfbab09e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2962,7 +2962,7 @@ struct tcp_md5sig_pool *tcp_get_md5sig_pool(void) spin_unlock(&tcp_md5sig_pool_lock); if (p) - return *per_cpu_ptr(p, smp_processor_id()); + return *this_cpu_ptr(p); local_bh_enable(); return NULL; |
