diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-04 10:39:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-04 10:39:20 -0400 |
| commit | 9402efaa96e4c047dcc63ad5db65384c328aee5f (patch) | |
| tree | e2df879ca02ab2306e000fbb771f2110d3530abe /arch/x86/kernel/smpboot.c | |
| parent | 78fca1b95837a44983608302e89c7258981be9b3 (diff) | |
| parent | 711b8c87a5fe6de78e90411cb67b506babfef74a (diff) | |
Merge branch 'x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into x86/mm
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index c2871d3c71b..a3c430bdfb6 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -1332,9 +1332,9 @@ static inline void mwait_play_dead(void) | |||
| 1332 | void *mwait_ptr; | 1332 | void *mwait_ptr; |
| 1333 | struct cpuinfo_x86 *c = __this_cpu_ptr(&cpu_info); | 1333 | struct cpuinfo_x86 *c = __this_cpu_ptr(&cpu_info); |
| 1334 | 1334 | ||
| 1335 | if (!(cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c))) | 1335 | if (!this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c)) |
| 1336 | return; | 1336 | return; |
| 1337 | if (!cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLSH)) | 1337 | if (!this_cpu_has(X86_FEATURE_CLFLSH)) |
| 1338 | return; | 1338 | return; |
| 1339 | if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF) | 1339 | if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF) |
| 1340 | return; | 1340 | return; |