diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
commit | 88bef5a4074e0568cf54df410f41065c06694d8a (patch) | |
tree | bc4d59f57ce315bcb16dad5491ab9983ab122d8a /arch/powerpc/kernel/idle.c | |
parent | flag parameters: fix compile error of sys_epoll_create1 (diff) | |
parent | x86_64: fix ia32 AMD syscall audit fast-path (diff) | |
download | linux-88bef5a4074e0568cf54df410f41065c06694d8a.tar.xz linux-88bef5a4074e0568cf54df410f41065c06694d8a.zip |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/powerpc/kernel/idle.c')
-rw-r--r-- | arch/powerpc/kernel/idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index c3cf0e8f3ac1..d308a9f70f1b 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c @@ -60,7 +60,7 @@ void cpu_idle(void) set_thread_flag(TIF_POLLING_NRFLAG); while (1) { - tick_nohz_stop_sched_tick(); + tick_nohz_stop_sched_tick(1); while (!need_resched() && !cpu_should_die()) { ppc64_runlatch_off(); |