diff options
-rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/include/asm/processor.h | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/idle.c | 19 |
3 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c81553508366..296e4f997974 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -87,10 +87,6 @@ config ARCH_HAS_ILOG2_U64 | |||
87 | bool | 87 | bool |
88 | default y if 64BIT | 88 | default y if 64BIT |
89 | 89 | ||
90 | config ARCH_HAS_CPU_IDLE_WAIT | ||
91 | bool | ||
92 | default y | ||
93 | |||
94 | config GENERIC_HWEIGHT | 90 | config GENERIC_HWEIGHT |
95 | bool | 91 | bool |
96 | default y | 92 | default y |
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 8e2d0371fe1e..48a26d379222 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h | |||
@@ -386,7 +386,6 @@ extern unsigned long cpuidle_disable; | |||
386 | enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF}; | 386 | enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF}; |
387 | 387 | ||
388 | extern int powersave_nap; /* set if nap mode can be used in idle loop */ | 388 | extern int powersave_nap; /* set if nap mode can be used in idle loop */ |
389 | void cpu_idle_wait(void); | ||
390 | 389 | ||
391 | #ifdef CONFIG_PSERIES_IDLE | 390 | #ifdef CONFIG_PSERIES_IDLE |
392 | extern void update_smt_snooze_delay(int snooze); | 391 | extern void update_smt_snooze_delay(int snooze); |
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index 04d79093d7a1..2099d9a879e8 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c | |||
@@ -113,25 +113,6 @@ void cpu_idle(void) | |||
113 | } | 113 | } |
114 | } | 114 | } |
115 | 115 | ||
116 | static void do_nothing(void *unused) | ||
117 | { | ||
118 | } | ||
119 | |||
120 | /* | ||
121 | * cpu_idle_wait - Used to ensure that all the CPUs come out of the old | ||
122 | * idle loop and start using the new idle loop. | ||
123 | * Required while changing idle handler on SMP systems. | ||
124 | * Caller must have changed idle handler to the new value before the call. | ||
125 | * This window may be larger on shared systems. | ||
126 | */ | ||
127 | void cpu_idle_wait(void) | ||
128 | { | ||
129 | smp_mb(); | ||
130 | /* kick all the CPUs so that they exit out of pm_idle */ | ||
131 | smp_call_function(do_nothing, NULL, 1); | ||
132 | } | ||
133 | EXPORT_SYMBOL_GPL(cpu_idle_wait); | ||
134 | |||
135 | int powersave_nap; | 116 | int powersave_nap; |
136 | 117 | ||
137 | #ifdef CONFIG_SYSCTL | 118 | #ifdef CONFIG_SYSCTL |