diff options
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r-- | arch/x86/kernel/process.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 67e9b4a1e89d..c7b6a694ca22 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -99,15 +99,6 @@ static void mwait_idle(void) | |||
99 | local_irq_enable(); | 99 | local_irq_enable(); |
100 | } | 100 | } |
101 | 101 | ||
102 | |||
103 | static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) | ||
104 | { | ||
105 | if (force_mwait) | ||
106 | return 1; | ||
107 | /* Any C1 states supported? */ | ||
108 | return c->cpuid_level >= 5 && ((cpuid_edx(5) >> 4) & 0xf) > 0; | ||
109 | } | ||
110 | |||
111 | /* | 102 | /* |
112 | * On SMP it's slightly faster (but much more power-consuming!) | 103 | * On SMP it's slightly faster (but much more power-consuming!) |
113 | * to poll the ->work.need_resched flag instead of waiting for the | 104 | * 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) | |||
131 | " performance may degrade.\n"); | 122 | " performance may degrade.\n"); |
132 | } | 123 | } |
133 | #endif | 124 | #endif |
134 | if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) { | 125 | if (cpu_has(c, X86_FEATURE_MWAIT)) { |
135 | /* | 126 | /* |
136 | * Skip, if setup has overridden idle. | 127 | * Skip, if setup has overridden idle. |
137 | * One CPU supports mwait => All CPUs supports mwait | 128 | * One CPU supports mwait => All CPUs supports mwait |