drivers/cpuidle: Replace __get_cpu_var uses for address calculation

Christoph Lameter · htejun · commit 229b6863b2cf · 2014-08-26T13:45:45.000-04:00
All of these are for address calculation. Replace with
this_cpu_ptr().

Cc: Daniel Lezcano &lt;daniel.lezcano@linaro.org&gt;
Cc: linux-pm@vger.kernel.org
Acked-by: Rafael J. Wysocki &lt;rjw@sisk.pl&gt;
[cpufreq changes]
Signed-off-by: Christoph Lameter &lt;cl@linux.com&gt;
Signed-off-by: Tejun Heo &lt;tj@kernel.org&gt;
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
@@ -66,7 +66,7 @@ static inline void ladder_do_selection(struct ladder_device *ldev,
 static int ladder_select_state(struct cpuidle_driver *drv,
 				struct cpuidle_device *dev)
 {
-	struct ladder_device *ldev = &__get_cpu_var(ladder_devices);
+	struct ladder_device *ldev = this_cpu_ptr(&ladder_devices);
 	struct ladder_device_state *last_state;
 	int last_residency, last_idx = ldev->last_state_idx;
 	int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
@@ -170,7 +170,7 @@ static int ladder_enable_device(struct cpuidle_driver *drv,
  */
 static void ladder_reflect(struct cpuidle_device *dev, int index)
 {
-	struct ladder_device *ldev = &__get_cpu_var(ladder_devices);
+	struct ladder_device *ldev = this_cpu_ptr(&ladder_devices);
 	if (index > 0)
 		ldev->last_state_idx = index;
 }
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
@@ -289,7 +289,7 @@ static void get_typical_interval(struct menu_device *data)
  */
 static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
 {
-	struct menu_device *data = &__get_cpu_var(menu_devices);
+	struct menu_device *data = this_cpu_ptr(&menu_devices);
 	int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
 	int i;
 	unsigned int interactivity_req;
@@ -372,7 +372,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
  */
 static void menu_reflect(struct cpuidle_device *dev, int index)
 {
-	struct menu_device *data = &__get_cpu_var(menu_devices);
+	struct menu_device *data = this_cpu_ptr(&menu_devices);
 	data->last_state_idx = index;
 	if (index >= 0)
 		data->needs_update = 1;
@@ -385,7 +385,7 @@ static void menu_reflect(struct cpuidle_device *dev, int index)
  */
 static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev)
 {
-	struct menu_device *data = &__get_cpu_var(menu_devices);
+	struct menu_device *data = this_cpu_ptr(&menu_devices);
 	int last_idx = data->last_state_idx;
 	struct cpuidle_state *target = &drv->states[last_idx];
 	unsigned int measured_us;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static inline void ladder_do_selection(struct ladder_device *ldev,`
`66`	`66`	`static int ladder_select_state(struct cpuidle_driver *drv,`
`67`	`67`	`struct cpuidle_device *dev)`
`68`	`68`	`{`
`69`		`- struct ladder_device *ldev = &__get_cpu_var(ladder_devices);`
	`69`	`+ struct ladder_device *ldev = this_cpu_ptr(&ladder_devices);`
`70`	`70`	`struct ladder_device_state *last_state;`
`71`	`71`	`int last_residency, last_idx = ldev->last_state_idx;`
`72`	`72`	`int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);`
`@@ -170,7 +170,7 @@ static int ladder_enable_device(struct cpuidle_driver *drv,`
`170`	`170`	`*/`
`171`	`171`	`static void ladder_reflect(struct cpuidle_device *dev, int index)`
`172`	`172`	`{`
`173`		`- struct ladder_device *ldev = &__get_cpu_var(ladder_devices);`
	`173`	`+ struct ladder_device *ldev = this_cpu_ptr(&ladder_devices);`
`174`	`174`	`if (index > 0)`
`175`	`175`	`ldev->last_state_idx = index;`
`176`	`176`	`}`