diff --git a/[refs] b/[refs] index ba8b5cebac15..a8c9ec0aee34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d36b49b91065dbfa305c5a66010b3497c741eee0 +refs/heads/master: 741673473a5b26497d5390f38d478362e27e22ad diff --git a/trunk/arch/i386/kernel/process.c b/trunk/arch/i386/kernel/process.c index 7845d480c293..bea304d48cdb 100644 --- a/trunk/arch/i386/kernel/process.c +++ b/trunk/arch/i386/kernel/process.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -211,6 +212,7 @@ void cpu_idle(void) /* endless idle loop with no priority at all */ while (1) { + tick_nohz_stop_sched_tick(); while (!need_resched()) { void (*idle)(void); @@ -238,6 +240,7 @@ void cpu_idle(void) idle(); __exit_idle(); } + tick_nohz_restart_sched_tick(); preempt_enable_no_resched(); schedule(); preempt_disable();