aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig3
-rw-r--r--arch/arm/include/asm/processor.h2
-rw-r--r--arch/arm/kernel/process.c20
3 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cb253ce218a0..a3ad49639fc0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -160,9 +160,6 @@ config ARCH_HAS_CPUFREQ
160 and that the relevant menu configurations are displayed for 160 and that the relevant menu configurations are displayed for
161 it. 161 it.
162 162
163config ARCH_HAS_CPU_IDLE_WAIT
164 def_bool y
165
166config GENERIC_HWEIGHT 163config GENERIC_HWEIGHT
167 bool 164 bool
168 default y 165 default y
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
index 5ac8d3d3e025..d7038fa22343 100644
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
@@ -88,8 +88,6 @@ unsigned long get_wchan(struct task_struct *p);
88#define cpu_relax() barrier() 88#define cpu_relax() barrier()
89#endif 89#endif
90 90
91void cpu_idle_wait(void);
92
93/* 91/*
94 * Create a new kernel thread 92 * Create a new kernel thread
95 */ 93 */
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 2b7b017a20cd..19c95ea65b2f 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -157,26 +157,6 @@ EXPORT_SYMBOL(pm_power_off);
157void (*arm_pm_restart)(char str, const char *cmd) = null_restart; 157void (*arm_pm_restart)(char str, const char *cmd) = null_restart;
158EXPORT_SYMBOL_GPL(arm_pm_restart); 158EXPORT_SYMBOL_GPL(arm_pm_restart);
159 159
160static void do_nothing(void *unused)
161{
162}
163
164/*
165 * cpu_idle_wait - Used to ensure that all the CPUs discard old value of
166 * pm_idle and update to new pm_idle value. Required while changing pm_idle
167 * handler on SMP systems.
168 *
169 * Caller must have changed pm_idle to the new value before the call. Old
170 * pm_idle value will not be used by any CPU after the return of this function.
171 */
172void cpu_idle_wait(void)
173{
174 smp_mb();
175 /* kick all the CPUs so that they exit out of pm_idle */
176 smp_call_function(do_nothing, NULL, 1);
177}
178EXPORT_SYMBOL_GPL(cpu_idle_wait);
179
180/* 160/*
181 * This is our default idle handler. 161 * This is our default idle handler.
182 */ 162 */