diff options
| author | Christoph Lameter | 2014-08-17 19:30:35 +0200 |
|---|---|---|
| committer | Tejun Heo | 2014-08-26 19:45:47 +0200 |
| commit | 903ceff7ca7b4d80c083a80ee5163b74e9fa359f (patch) | |
| tree | 60c82f70f9d58720042bb3249eb6fa9f89fe9025 /include/net/netfilter | |
| parent | watchdog: Replace __raw_get_cpu_var uses (diff) | |
| download | kernel-qcow2-linux-903ceff7ca7b4d80c083a80ee5163b74e9fa359f.tar.gz kernel-qcow2-linux-903ceff7ca7b4d80c083a80ee5163b74e9fa359f.tar.xz kernel-qcow2-linux-903ceff7ca7b4d80c083a80ee5163b74e9fa359f.zip | |
net: Replace get_cpu_var through this_cpu_ptr
Replace uses of get_cpu_var for address calculation through this_cpu_ptr.
Cc: netdev@vger.kernel.org
Cc: Eric Dumazet <edumazet@google.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/net/netfilter')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 37252f71a380..c8a7db605e03 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -242,7 +242,7 @@ extern s32 (*nf_ct_nat_offset)(const struct nf_conn *ct, DECLARE_PER_CPU(struct nf_conn, nf_conntrack_untracked); static inline struct nf_conn *nf_ct_untracked_get(void) { - return &__raw_get_cpu_var(nf_conntrack_untracked); + return raw_cpu_ptr(&nf_conntrack_untracked); } void nf_ct_untracked_status_or(unsigned long bits); |