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/um | |
| 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/um')
| -rw-r--r-- | arch/um/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 83603cfbde81..a1c6d07cac3e 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
| @@ -243,7 +243,7 @@ void default_idle(void) | |||
| 243 | if (need_resched()) | 243 | if (need_resched()) |
| 244 | schedule(); | 244 | schedule(); |
| 245 | 245 | ||
| 246 | tick_nohz_stop_sched_tick(); | 246 | tick_nohz_stop_sched_tick(1); |
| 247 | nsecs = disable_timer(); | 247 | nsecs = disable_timer(); |
| 248 | idle_sleep(nsecs); | 248 | idle_sleep(nsecs); |
| 249 | tick_nohz_restart_sched_tick(); | 249 | tick_nohz_restart_sched_tick(); |