Merge branch 'linus' into timers/nohz

This commit is contained in:
Ingo Molnar
2008-07-18 19:53:16 +02:00
4958 changed files with 298069 additions and 304351 deletions

View File

@@ -133,10 +133,8 @@ static void default_idle(void)
cpu_relax();
else {
local_irq_disable();
if (!need_resched()) {
timer_dyn_reprogram();
if (!need_resched())
arch_idle();
}
local_irq_enable();
}
}