From 36e3064c5ff1f845fa8275336598a258600af726 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Sat, 9 Feb 2013 23:15:13 -0500 Subject: [PATCH] --- yaml --- r: 351091 b: refs/heads/master c: dc883ca34a4e8a309d652c86daab6f1b4edd9d4b h: refs/heads/master i: 351089: 1f9827f8bbe119543e8281f5357603f5ab328fd3 351087: 28129285327fb7ed75ea474a8c3cc59da57be905 v: v3 --- [refs] | 2 +- trunk/arch/arm64/kernel/process.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e3a0c489c25d..df640261bbe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0ea11497c8cbc5a66019814efa1733e47e47ab1 +refs/heads/master: dc883ca34a4e8a309d652c86daab6f1b4edd9d4b diff --git a/trunk/arch/arm64/kernel/process.c b/trunk/arch/arm64/kernel/process.c index cb0956bc96ed..c7002d40a9b0 100644 --- a/trunk/arch/arm64/kernel/process.c +++ b/trunk/arch/arm64/kernel/process.c @@ -97,14 +97,9 @@ static void default_idle(void) local_irq_enable(); } -void (*pm_idle)(void) = default_idle; -EXPORT_SYMBOL_GPL(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) { @@ -122,10 +117,10 @@ void cpu_idle(void) local_irq_disable(); if (!need_resched()) { stop_critical_timings(); - pm_idle(); + default_idle(); start_critical_timings(); /* - * pm_idle functions should always return + * default_idle functions should always return * with IRQs enabled. */ WARN_ON(irqs_disabled());