diff options
| author | Ingo Molnar | 2011-12-14 08:16:43 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2011-12-14 08:16:43 +0100 |
| commit | 919b83452b2e7c1dbced0456015508b4b9585db3 (patch) | |
| tree | 836d0c32b814f7bd5fed83e19b6a2ab77dcf6987 /arch/arm/kernel | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | cpu: Export cpu_up() (diff) | |
| download | kernel-qcow2-linux-919b83452b2e7c1dbced0456015508b4b9585db3.tar.gz kernel-qcow2-linux-919b83452b2e7c1dbced0456015508b4b9585db3.tar.xz kernel-qcow2-linux-919b83452b2e7c1dbced0456015508b4b9585db3.zip | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/process.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 3d0c6fb74ae4..e8e8fe505df1 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -183,7 +183,8 @@ void cpu_idle(void) /* endless idle loop with no priority at all */ while (1) { - tick_nohz_stop_sched_tick(1); + tick_nohz_idle_enter(); + rcu_idle_enter(); leds_event(led_idle_start); while (!need_resched()) { #ifdef CONFIG_HOTPLUG_CPU @@ -213,7 +214,8 @@ void cpu_idle(void) } } leds_event(led_idle_end); - tick_nohz_restart_sched_tick(); + rcu_idle_exit(); + tick_nohz_idle_exit(); preempt_enable_no_resched(); schedule(); preempt_disable(); |