| From 8fb27384a7f934ae0f01e86b41a8cdc22bf57ca7 Mon Sep 17 00:00:00 2001 |
| From: David Brown <davidb@codeaurora.org> |
| 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 <khilman@deeprootsystems.com> |
| Cc: Paul Mundt <lethal@linux-sh.org> |
| Cc: x86@kernel.org |
| Cc: Len Brown <len.brown@intel.com> |
| Signed-off-by: David Brown <davidb@codeaurora.org> |
| [ 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 <torvalds@linux-foundation.org> |
| (cherry picked from commit cbc158d6bfa1990f7869717bb5270867c66068d1) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| arch/arm/kernel/process.c | 2 +- |
| arch/sh/kernel/idle.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c |
| index 5affc61..c9d11ea 100644 |
| --- a/arch/arm/kernel/process.c |
| +++ b/arch/arm/kernel/process.c |
| @@ -200,7 +200,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 9c7099e..1db1968 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 |
| -- |
| 1.7.10.1.362.g242cab3 |
| |
