diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:55:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:55:01 -0400 |
| commit | ecc8b655b38a880b578146895e0e1e2d477ca2c0 (patch) | |
| tree | 4acce96bac00909fa9472f0c0669714243ea5bee /arch/arm | |
| parent | 2528ce3237be4e900f5eaa455490146e1422e424 (diff) | |
| parent | e338125b8a886923ba8367207c144764dc352584 (diff) | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
nohz: adjust tick_nohz_stop_sched_tick() call of s390 as well
nohz: prevent tick stop outside of the idle loop
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 199b3680118b..89bfded70a1f 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
| @@ -162,7 +162,7 @@ void cpu_idle(void) | |||
| 162 | if (!idle) | 162 | if (!idle) |
| 163 | idle = default_idle; | 163 | idle = default_idle; |
| 164 | leds_event(led_idle_start); | 164 | leds_event(led_idle_start); |
| 165 | tick_nohz_stop_sched_tick(); | 165 | tick_nohz_stop_sched_tick(1); |
| 166 | while (!need_resched()) | 166 | while (!need_resched()) |
| 167 | idle(); | 167 | idle(); |
| 168 | leds_event(led_idle_end); | 168 | leds_event(led_idle_end); |