From: Christoph Lameter <cl@linux.com>
Date: Tue, 15 Apr 2014 17:39:14 +0000 (-0500)
Subject: percpu: Replace __get_cpu_var with this_cpu_ptr
X-Git-Tag: v3.16-rc1~75^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fdb9c293decf7e06795f7d9ae409df907c7ae1b6;p=~emulex%2Finfiniband.git

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>
---

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index e7a0b95ed52..539b3caa574 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