diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/process_32.c | 10 | ||||
| -rw-r--r-- | arch/x86/kernel/process_64.c | 11 |
2 files changed, 2 insertions, 19 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index c8890b8b772a..54bb813bc29b 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -259,14 +259,6 @@ static void mwait_idle(void) mwait_idle_with_hints(0, 0); } -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; -} - void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) { static int selected; @@ -279,7 +271,7 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) " performance may degrade.\n"); } #endif - if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) { + if (cpu_has(c, X86_FEATURE_MWAIT)) { /* * Skip, if setup has overridden idle. * One CPU supports mwait => All CPUs supports mwait diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 1316f1cb7d87..fbb171fc2bee 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -254,15 +254,6 @@ static void mwait_idle(void) } } - -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; -} - void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) { static int selected; @@ -275,7 +266,7 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) " performance may degrade.\n"); } #endif - if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) { + if (cpu_has(c, X86_FEATURE_MWAIT)) { /* * Skip, if setup has overridden idle. * One CPU supports mwait => All CPUs supports mwait |