From bd47f8b35bbc6ac66047ab032fc4dfc01aac6d93 Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 4 Aug 2011 09:24:31 -0700 Subject: [PATCH] --- yaml --- r: 262412 b: refs/heads/master c: cbc158d6bfa1990f7869717bb5270867c66068d1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/process.c | 2 +- trunk/arch/sh/kernel/idle.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7afbfcb49d98..67ff6ec37b33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53d1e658df6e26d62500410719aaee2b82067c03 +refs/heads/master: cbc158d6bfa1990f7869717bb5270867c66068d1 diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c index d7ee0d4c072d..1a347f481e5e 100644 --- a/trunk/arch/arm/kernel/process.c +++ b/trunk/arch/arm/kernel/process.c @@ -197,7 +197,7 @@ void cpu_idle(void) cpu_relax(); } else { stop_critical_timings(); - if (cpuidle_call_idle()) + if (cpuidle_idle_call()) pm_idle(); start_critical_timings(); /* diff --git a/trunk/arch/sh/kernel/idle.c b/trunk/arch/sh/kernel/idle.c index 3c45de1db716..32114e0941ae 100644 --- a/trunk/arch/sh/kernel/idle.c +++ b/trunk/arch/sh/kernel/idle.c @@ -101,7 +101,7 @@ void cpu_idle(void) local_irq_disable(); /* Don't trace irqs off for idle */ stop_critical_timings(); - if (cpuidle_call_idle()) + if (cpuidle_idle_call()) pm_idle(); /* * Sanity check to ensure that pm_idle() returns