diff options
Diffstat (limited to 'arch/arm/kernel/process.c')
| -rw-r--r-- | arch/arm/kernel/process.c | 13 | 
1 files changed, 4 insertions, 9 deletions
| diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index c6dec5fc20aa..047d3e40e470 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -172,14 +172,9 @@ static void default_idle(void)  	local_irq_enable();  } -void (*pm_idle)(void) = default_idle; -EXPORT_SYMBOL(pm_idle); -  /* - * The idle thread, has rather strange semantics for calling pm_idle, - * but this is what x86 does and we need to do the same, so that - * things like cpuidle get called in the same way.  The only difference - * is that we always respect 'hlt_counter' to prevent low power idle. + * The idle thread. + * We always respect 'hlt_counter' to prevent low power idle.   */  void cpu_idle(void)  { @@ -210,10 +205,10 @@ void cpu_idle(void)  			} else if (!need_resched()) {  				stop_critical_timings();  				if (cpuidle_idle_call()) -					pm_idle(); +					default_idle();  				start_critical_timings();  				/* -				 * pm_idle functions must always +				 * default_idle functions must always  				 * return with IRQs enabled.  				 */  				WARN_ON(irqs_disabled()); |