[PATCH 11/48] drivers/cpuidle: Replace __get_cpu_var uses for address calculation
STALE4594d
REVIEWED: 1 (0M)
From: Christoph Lameter <hidden>
Date: 2014-02-14 20:19:35
Also in:
lkml
1 review trailer.
All of these are for address calculation. Replace with this_cpu_ptr(). Cc: Daniel Lezcano <redacted> Cc: linux-pm@vger.kernel.org Acked-by: Rafael J. Wysocki <redacted> [cpufreq changes] Signed-off-by: Christoph Lameter <redacted> Index: linux/drivers/cpuidle/governors/ladder.c ===================================================================
--- linux.orig/drivers/cpuidle/governors/ladder.c 2013-12-02 16:07:48.284675507 -0600
+++ linux/drivers/cpuidle/governors/ladder.c 2013-12-02 16:07:48.274675782 -0600@@ -66,7 +66,7 @@ static inline void ladder_do_selection(s 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 c */ 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; }
Index: linux/drivers/cpuidle/governors/menu.c ===================================================================
--- linux.orig/drivers/cpuidle/governors/menu.c 2013-12-02 16:07:48.284675507 -0600
+++ linux/drivers/cpuidle/governors/menu.c 2013-12-02 16:07:48.274675782 -0600@@ -286,7 +286,7 @@ again: */ 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; int multiplier;
@@ -375,7 +375,7 @@ static int menu_select(struct cpuidle_dr */ 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;
@@ -388,7 +388,7 @@ static void menu_reflect(struct cpuidle_ */ 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; unsigned int last_idle_us = cpuidle_get_last_residency(dev); struct cpuidle_state *target = &drv->states[last_idx];