|
@@ -99,15 +99,6 @@ static void mwait_idle(void)
|
|
local_irq_enable();
|
|
local_irq_enable();
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c)
|
|
|
|
-{
|
|
|
|
- if (force_mwait)
|
|
|
|
- return 1;
|
|
|
|
- /* Any C1 states supported? */
|
|
|
|
- return c->cpuid_level >= 5 && ((cpuid_edx(5) >> 4) & 0xf) > 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* On SMP it's slightly faster (but much more power-consuming!)
|
|
* On SMP it's slightly faster (but much more power-consuming!)
|
|
* to poll the ->work.need_resched flag instead of waiting for the
|
|
* to poll the ->work.need_resched flag instead of waiting for the
|
|
@@ -131,7 +122,7 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
|
|
" performance may degrade.\n");
|
|
" performance may degrade.\n");
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
- if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) {
|
|
|
|
|
|
+ if (cpu_has(c, X86_FEATURE_MWAIT)) {
|
|
/*
|
|
/*
|
|
* Skip, if setup has overridden idle.
|
|
* Skip, if setup has overridden idle.
|
|
* One CPU supports mwait => All CPUs supports mwait
|
|
* One CPU supports mwait => All CPUs supports mwait
|