Cc: Arjan van de Ven <arjan@infradead.org>

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

drivers/cpuidle/governors/menu-tng.c

@@ -167,7 +167,7 @@ static inline int performance_multiplier(void)
 	return mult;
 }
 
-static DEFINE_PER_CPU(struct menu_device, menu_devices);
+static DEFINE_PER_CPU(struct menu_device, tng_menu_devices);
 
 /**
  * menu_select - selects the next idle state to enter
@@ -175,7 +175,7 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);
  */
 static int menu_select(struct cpuidle_device *dev)
 {
-	struct menu_device *data = &__get_cpu_var(menu_devices);
+	struct menu_device *data = &__get_cpu_var(tng_menu_devices);
 	int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
 	int i, multiplier;
 
@@ -241,7 +241,7 @@ static int menu_select(struct cpuidle_device *dev)
  */
 static void menu_reflect(struct cpuidle_device *dev)
 {
-	struct menu_device *data = &__get_cpu_var(menu_devices);
+	struct menu_device *data = &__get_cpu_var(tng_menu_devices);
 	int last_idx = data->last_state_idx;
 	unsigned int last_idle_us = cpuidle_get_last_residency(dev);
 	struct cpuidle_state *target = &dev->states[last_idx];
@@ -297,7 +297,7 @@ static void menu_reflect(struct cpuidle_device *dev)
  */
 static int menu_enable_device(struct cpuidle_device *dev)
 {
-	struct menu_device *data = &per_cpu(menu_devices, dev->cpu);
+	struct menu_device *data = &per_cpu(tng_menu_devices, dev->cpu);
 
 	memset(data, 0, sizeof(struct menu_device));