From: Thomas Gleixner Date: Mon, 7 May 2012 17:59:51 +0000 (+0000) Subject: sh: Remove cpu_idle_wait() X-Git-Tag: upstream/snapshot3+hdmi~7457^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86627c93b35082f7a0e4d3111546943984b932c7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git sh: Remove cpu_idle_wait() cpuidle uses generic kick_all_cpus_sync() now. Remove the unused code. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Paul Mundt Link: http://lkml.kernel.org/r/20120507175652.461648208@linutronix.de --- diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 244cfd0..04a8cb4 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -153,9 +153,6 @@ config ARCH_NO_VIRT_TO_BUS config ARCH_HAS_DEFAULT_IDLE def_bool y -config ARCH_HAS_CPU_IDLE_WAIT - def_bool y - config NO_IOPORT def_bool !PCI depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h index 6d87912..6dbc1be 100644 --- a/arch/sh/include/asm/processor.h +++ b/arch/sh/include/asm/processor.h @@ -98,7 +98,6 @@ extern struct sh_cpuinfo cpu_data[]; #define cpu_relax() barrier() void default_idle(void); -void cpu_idle_wait(void); void stop_this_cpu(void *); /* Forward decl */ diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index ee226e2..0c91016 100644 --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c @@ -132,10 +132,6 @@ void __init select_idle_routine(void) pm_idle = poll_idle; } -static void do_nothing(void *unused) -{ -} - void stop_this_cpu(void *unused) { local_irq_disable(); @@ -144,19 +140,3 @@ void stop_this_cpu(void *unused) for (;;) cpu_sleep(); } - -/* - * cpu_idle_wait - Used to ensure that all the CPUs discard old value of - * pm_idle and update to new pm_idle value. Required while changing pm_idle - * handler on SMP systems. - * - * Caller must have changed pm_idle to the new value before the call. Old - * pm_idle value will not be used by any CPU after the return of this function. - */ -void cpu_idle_wait(void) -{ - smp_mb(); - /* kick all the CPUs so that they exit out of pm_idle */ - smp_call_function(do_nothing, NULL, 1); -} -EXPORT_SYMBOL_GPL(cpu_idle_wait);