[PATCH] x86: Clean up mwait_play_dead

From: Frank Arnold
Date: Wed Apr 13 2011 - 12:11:28 EST

From: Frank Arnold <frank.arnold@xxxxxxx>

Commit 93789b32dbf355e70f18b17a82e8661677a7f7fb introduced
cpuinfo_x86 *c for brevity. It is used to check for the
mwait feature flag. The same can be done with a subsequent
check for clflsh and save us a second per-cpu pointer

Signed-off-by: Frank Arnold <frank.arnold@xxxxxxx>
Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
arch/x86/kernel/smpboot.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index c2871d3..93a0066 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1334,7 +1334,7 @@ static inline void mwait_play_dead(void)

if (!(cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)))
- if (!cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLSH))
+ if (!cpu_has(c, X86_FEATURE_CLFLSH))
if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/