Subject: [PATCH 06/31] drivers/cpuidle: Replace __get_cpu_var uses for address calculation

All of these are for address calculation. Replace with
this_cpu_ptr().

Cc: Daniel Lezcano <[email protected]>
Cc: [email protected]
Acked-by: Rafael J. Wysocki <[email protected]>
[cpufreq changes]
Signed-off-by: Christoph Lameter <[email protected]>

Index: linux/drivers/cpuidle/governors/ladder.c
===================================================================
--- linux.orig/drivers/cpuidle/governors/ladder.c 2014-05-21 22:47:23.951916206 -0500
+++ linux/drivers/cpuidle/governors/ladder.c 2014-05-21 22:47:23.943916368 -0500
@@ -66,7 +66,7 @@
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 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 2014-05-21 22:47:23.951916206 -0500
+++ linux/drivers/cpuidle/governors/menu.c 2014-05-21 22:47:23.943916368 -0500
@@ -285,7 +285,7 @@
*/
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;
@@ -370,7 +370,7 @@
*/
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;
@@ -383,7 +383,7 @@
*/
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;


2014-07-18 23:28:42

by Tejun Heo

[permalink] [raw]
Subject: Re: [PATCH 06/31] drivers/cpuidle: Replace __get_cpu_var uses for address calculation

On Fri, Jun 20, 2014 at 02:31:21PM -0500, Christoph Lameter wrote:
> All of these are for address calculation. Replace with
> this_cpu_ptr().
>
> Cc: Daniel Lezcano <[email protected]>
> Cc: [email protected]
> Acked-by: Rafael J. Wysocki <[email protected]>
> [cpufreq changes]
> Signed-off-by: Christoph Lameter <[email protected]>

Applied to wq/for-3.17-consistent-ops. If this patch should be routed
differently, please holler.

Thanks.

--
tejun