From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752483Ab0JCPWR (ORCPT ); Sun, 3 Oct 2010 11:22:17 -0400 Received: from mail.skyhub.de ([78.46.96.112]:40930 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752116Ab0JCPWQ (ORCPT ); Sun, 3 Oct 2010 11:22:16 -0400 Date: Sun, 3 Oct 2010 17:22:12 +0200 From: Borislav Petkov To: "H. Peter Anvin" Cc: Ingo Molnar , Thomas Gleixner , lkml Subject: [PATCH] x86, cpu: X86_FEATURE_NOPL should be disabled on 32-bit only Message-ID: <20101003152212.GA13233@liondog.tnic> Mail-Followup-To: Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , lkml References: <20101003093701.GB3733@liondog.tnic> <4CA89681.8000202@zytor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4CA89681.8000202@zytor.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ba0593bf553c450a03dbc5f8c1f0ff58b778a0c8 cleared the aforementioned cpuid bit only on 32-bit due to various problems with Virtual PC. This somehow got lost during the 32- + 64-bit merge so restore the feature bit on 64-bit. Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/common.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index caa967d..9a2cfeb 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -713,7 +713,9 @@ void __init early_cpu_init(void) */ static void __cpuinit detect_nopl(struct cpuinfo_x86 *c) { +#ifdef CONFIG_X86_32 clear_cpu_cap(c, X86_FEATURE_NOPL); +#endif } static void __cpuinit generic_identify(struct cpuinfo_x86 *c) -- 1.7.2.3 -- Regards/Gruss, Boris.