diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-14 08:16:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-14 08:16:43 +0100 |
| commit | 919b83452b2e7c1dbced0456015508b4b9585db3 (patch) | |
| tree | 836d0c32b814f7bd5fed83e19b6a2ab77dcf6987 /arch/unicore32 | |
| parent | 373da0a2a33018d560afcb2c77f8842985d79594 (diff) | |
| parent | a513f6bab0939800dcf1e7c075e733420cf967c5 (diff) | |
| download | linux-919b83452b2e7c1dbced0456015508b4b9585db3.tar.bz2 | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/kernel/process.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c index ba401df971ed..52edc2b62873 100644 --- a/arch/unicore32/kernel/process.c +++ b/arch/unicore32/kernel/process.c @@ -55,7 +55,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(); while (!need_resched()) { local_irq_disable(); stop_critical_timings(); @@ -63,7 +64,8 @@ void cpu_idle(void) local_irq_enable(); start_critical_timings(); } - tick_nohz_restart_sched_tick(); + rcu_idle_exit(); + tick_nohz_idle_exit(); preempt_enable_no_resched(); schedule(); preempt_disable(); |