summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/process.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-07-21 14:39:06 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-07-21 14:39:06 -0700
commitd6348a53b9f9d776358b7261dfcdab06ffeafc78 (patch)
treec457cfa36d17817d8e4b6f7e43452cc2e929246e /arch/arm/kernel/process.c
parent3371370efef73fef66926509b6e84248c6731c97 (diff)
parentd74348cebf7b883a872c5f0cfdf815855e08db5a (diff)
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r--arch/arm/kernel/process.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 34ea86448ea..919de7c84f7 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -32,7 +32,6 @@
#include <linux/hw_breakpoint.h>
#include <asm/cacheflush.h>
-#include <asm/leds.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/thread_notify.h>
@@ -183,7 +182,7 @@ void cpu_idle(void)
/* endless idle loop with no priority at all */
while (1) {
tick_nohz_stop_sched_tick(1);
- leds_event(led_idle_start);
+ idle_notifier_call_chain(IDLE_START);
while (!need_resched()) {
#ifdef CONFIG_HOTPLUG_CPU
if (cpu_is_offline(smp_processor_id()))
@@ -207,7 +206,7 @@ void cpu_idle(void)
local_irq_enable();
}
}
- leds_event(led_idle_end);
+ idle_notifier_call_chain(IDLE_END);
tick_nohz_restart_sched_tick();
preempt_enable_no_resched();
schedule();