From cbc158d6bfa1990f7869717bb5270867c66068d1 Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 4 Aug 2011 09:24:31 -0700 Subject: cpuidle: Consistent spelling of cpuidle_idle_call() Commit a0bfa1373859e9d11dc92561a8667588803e42d8 mispells cpuidle_idle_call() on ARM and SH code. Fix this to be consistent. Cc: Kevin Hilman Cc: Paul Mundt Cc: x86@kernel.org Cc: Len Brown Signed-off-by: David Brown [ Also done by Mark Brown - th ebug has been around forever, and was noticed in -next, but the idle tree never picked it up. Bad bad bad ] Signed-off-by: Linus Torvalds diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index d7ee0d4..1a347f4 100644 --- a/arch/arm/kernel/process.c +++ b/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/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index 3c45de1..32114e0 100644 --- a/arch/sh/kernel/idle.c +++ b/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 -- cgit v0.10.2