From 0534eb74a0281637366eef78ca80dbb1195bd242 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Sat, 9 Feb 2013 22:22:38 -0500 Subject: [PATCH] --- yaml --- r: 351090 b: refs/heads/master c: b0ea11497c8cbc5a66019814efa1733e47e47ab1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/process.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 3e3c941d3f53..e3a0c489c25d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26bab0c976c5984e313d17d54997b74641f32544 +refs/heads/master: b0ea11497c8cbc5a66019814efa1733e47e47ab1 diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c index c6dec5fc20aa..047d3e40e470 100644 --- a/trunk/arch/arm/kernel/process.c +++ b/trunk/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());