|
@@ -289,7 +289,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;
|
|
|
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;
|