Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932618Ab1DMQLY (ORCPT ); Wed, 13 Apr 2011 12:11:24 -0400 Received: from s15228384.onlinehome-server.info ([87.106.30.177]:33646 "EHLO mail.x86-64.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932194Ab1DMQLV (ORCPT ); Wed, 13 Apr 2011 12:11:21 -0400 From: Frank Arnold To: Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner Cc: Subject: [PATCH] x86: Clean up mwait_play_dead Date: Wed, 13 Apr 2011 18:11:13 +0200 Message-Id: <1302711073-31985-1-git-send-email-farnold@amd64.org> X-Mailer: git-send-email 1.7.3.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1222 Lines: 35 From: Frank Arnold 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 dereference. Signed-off-by: Frank Arnold Acked-by: Borislav Petkov --- 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))) return; - if (!cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLSH)) + if (!cpu_has(c, X86_FEATURE_CLFLSH)) return; if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF) return; -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/