percpu: Replace __get_cpu_var with this_cpu_ptr
authorChristoph Lameter <cl@linux.com>
Tue, 15 Apr 2014 17:39:14 +0000 (12:39 -0500)
committerTejun Heo <tj@kernel.org>
Tue, 15 Apr 2014 18:21:37 +0000 (14:21 -0400)
__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>
include/linux/percpu.h

index e7a0b95ed5279bdbc6bd478d3c9bb0452e57958c..539b3caa57486a2a5168f50a2a2dd07bfda35750 100644 (file)
@@ -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