summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 23:55:01 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 23:55:01 +0400
commitecc8b655b38a880b578146895e0e1e2d477ca2c0 (patch)
tree4acce96bac00909fa9472f0c0669714243ea5bee /arch/um
parent2528ce3237be4e900f5eaa455490146e1422e424 (diff)
parente338125b8a886923ba8367207c144764dc352584 (diff)
downloadlinux-ecc8b655b38a880b578146895e0e1e2d477ca2c0.tar.xz
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.c2
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)
if (need_resched())
schedule();
- tick_nohz_stop_sched_tick();
+ tick_nohz_stop_sched_tick(1);
nsecs = disable_timer();
idle_sleep(nsecs);
tick_nohz_restart_sched_tick();