From patchwork Mon Sep 6 13:14:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 158141 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o86DKYas026745 for ; Mon, 6 Sep 2010 13:20:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754552Ab0IFNUc (ORCPT ); Mon, 6 Sep 2010 09:20:32 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:25829 "EHLO TX2EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754491Ab0IFNUb (ORCPT ); Mon, 6 Sep 2010 09:20:31 -0400 Received: from mail96-tx2-R.bigfish.com (10.9.14.254) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 8.1.340.0; Mon, 6 Sep 2010 13:20:30 +0000 Received: from mail96-tx2 (localhost.localdomain [127.0.0.1]) by mail96-tx2-R.bigfish.com (Postfix) with ESMTP id 95F9D14F015D; Mon, 6 Sep 2010 13:20:30 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzbb2cKzz1202hzz8275bh8275dhz32i2a8h43h61h) X-Spam-TCS-SCL: 0:0 Received: from mail96-tx2 (localhost.localdomain [127.0.0.1]) by mail96-tx2 (MessageSwitch) id 1283779228562576_26335; Mon, 6 Sep 2010 13:20:28 +0000 (UTC) Received: from TX2EHSMHS038.bigfish.com (unknown [10.9.14.246]) by mail96-tx2.bigfish.com (Postfix) with ESMTP id 720A3B8004C; Mon, 6 Sep 2010 13:20:28 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by TX2EHSMHS038.bigfish.com (10.9.99.138) with Microsoft SMTP Server (TLS) id 14.0.482.44; Mon, 6 Sep 2010 13:20:12 +0000 Received: from ausb3twp01.amd.com ([163.181.250.37]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o86DKsmZ027886; Mon, 6 Sep 2010 08:21:22 -0500 X-WSS-ID: 0L8BUAM-01-78L-02 X-M-MSG: Received: from sausexhtp02.amd.com (sausexhtp02.amd.com [163.181.3.152]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 282A3102863F; Mon, 6 Sep 2010 08:18:21 -0500 (CDT) Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 6 Sep 2010 08:18:25 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.3.83.0; Mon, 6 Sep 2010 09:18:24 -0400 Received: from localhost.localdomain (tronje.osrc.amd.com [165.204.15.48]) by gwo.osrc.amd.com (Postfix) with ESMTP id A228949C14A; Mon, 6 Sep 2010 14:18:23 +0100 (BST) From: Andre Przywara To: , , CC: , , Andre Przywara , ", \".35.x]"@domain.invalid Subject: [PATCH 1/4] x86: Fix misnamed AMD CPUID feature bit Date: Mon, 6 Sep 2010 15:14:17 +0200 Message-ID: <1283778860-26843-2-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1283778860-26843-1-git-send-email-andre.przywara@amd.com> References: <1283778860-26843-1-git-send-email-andre.przywara@amd.com> MIME-Version: 1.0 X-Reverse-DNS: unknown Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Sep 2010 13:20:35 +0000 (UTC) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 781a50b..c9c73d8 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -152,7 +152,7 @@ #define X86_FEATURE_3DNOWPREFETCH (6*32+ 8) /* 3DNow prefetch instructions */ #define X86_FEATURE_OSVW (6*32+ 9) /* OS Visible Workaround */ #define X86_FEATURE_IBS (6*32+10) /* Instruction Based Sampling */ -#define X86_FEATURE_SSE5 (6*32+11) /* SSE-5 */ +#define X86_FEATURE_XOP (6*32+11) /* extended AVX instructions */ #define X86_FEATURE_SKINIT (6*32+12) /* SKINIT/STGI instructions */ #define X86_FEATURE_WDT (6*32+13) /* Watchdog timer */ #define X86_FEATURE_NODEID_MSR (6*32+19) /* NodeId MSR */ diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3a09c62..dd54779 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1996,7 +1996,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, const u32 kvm_supported_word6_x86_features = F(LAHF_LM) | F(CMP_LEGACY) | F(SVM) | 0 /* ExtApicSpace */ | F(CR8_LEGACY) | F(ABM) | F(SSE4A) | F(MISALIGNSSE) | - F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(SSE5) | + F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) | 0 /* SKINIT */ | 0 /* WDT */; /* all calls to cpuid_count() should be made on the same cpu */