Skip to content

Commit

Permalink
sh: Remove cpu_idle_wait()
Browse files Browse the repository at this point in the history
cpuidle uses generic kick_all_cpus_sync() now. Remove the unused code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Link: http://lkml.kernel.org/r/20120507175652.461648208@linutronix.de
  • Loading branch information
Thomas Gleixner committed May 8, 2012
1 parent c9b92b8 commit 86627c9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
3 changes: 0 additions & 3 deletions arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/sh/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
20 changes: 0 additions & 20 deletions arch/sh/kernel/idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);

0 comments on commit 86627c9

Please sign in to comment.