diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /arch/s390/kernel/process.c | |
parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/s390/kernel/process.c')
-rw-r--r-- | arch/s390/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 85defd01d293..9839767d0842 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
@@ -142,7 +142,7 @@ static void default_idle(void) | |||
142 | void cpu_idle(void) | 142 | void cpu_idle(void) |
143 | { | 143 | { |
144 | for (;;) { | 144 | for (;;) { |
145 | tick_nohz_stop_sched_tick(); | 145 | tick_nohz_stop_sched_tick(1); |
146 | while (!need_resched()) | 146 | while (!need_resched()) |
147 | default_idle(); | 147 | default_idle(); |
148 | tick_nohz_restart_sched_tick(); | 148 | tick_nohz_restart_sched_tick(); |