summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-04-15 12:39:14 -0500
committerTejun Heo <tj@kernel.org>2014-04-15 14:21:37 -0400
commitfdb9c293decf7e06795f7d9ae409df907c7ae1b6 (patch)
tree1db0df4da7fad5d8564442ff0decacbddea8a9af /include/linux
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
percpu: Replace __get_cpu_var with this_cpu_ptr
__this_cpu_ptr is being phased out. Use raw_cpu_ptr instead which was introduced in 3.15-rc1. One case of using __get_cpu_var in the get_cpu_var macro for address calculation was remaining in include/linux/percpu.h. tj: Updated patch description. Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/percpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index e7a0b95ed527..539b3caa5748 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -29,7 +29,7 @@
*/
#define get_cpu_var(var) (*({ \
preempt_disable(); \
- &__get_cpu_var(var); }))
+ this_cpu_ptr(&var); }))
/*
* The weird & is necessary because sparse considers (void)(var) to be