From patchwork Fri Sep 3 09:27:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 152801 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 o839brmr001396 for ; Fri, 3 Sep 2010 09:37:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751091Ab0ICJhu (ORCPT ); Fri, 3 Sep 2010 05:37:50 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:14671 "EHLO TX2EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800Ab0ICJhu (ORCPT ); Fri, 3 Sep 2010 05:37:50 -0400 Received: from mail158-tx2-R.bigfish.com (10.9.14.247) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 8.1.340.0; Fri, 3 Sep 2010 09:37:49 +0000 Received: from mail158-tx2 (localhost.localdomain [127.0.0.1]) by mail158-tx2-R.bigfish.com (Postfix) with ESMTP id BF7C8EC00C6; Fri, 3 Sep 2010 09:37:48 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzbb2cKzz1202hzz8275bh8275dhz32i2a8h) X-FB-SS: 0, Received: from mail158-tx2 (localhost.localdomain [127.0.0.1]) by mail158-tx2 (MessageSwitch) id 1283506668411566_14821; Fri, 3 Sep 2010 09:37:48 +0000 (UTC) Received: from TX2EHSMHS019.bigfish.com (unknown [10.9.14.249]) by mail158-tx2.bigfish.com (Postfix) with ESMTP id 61F7F4F804E; Fri, 3 Sep 2010 09:37:48 +0000 (UTC) Received: from ausb3extmailp02.amd.com (163.181.251.22) by TX2EHSMHS019.bigfish.com (10.9.99.119) with Microsoft SMTP Server (TLS) id 14.0.482.44; Fri, 3 Sep 2010 09:37:32 +0000 Received: from ausb3twp01.amd.com (ausb3twp01.amd.com [163.181.250.37]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o839SRLn007637; Fri, 3 Sep 2010 04:28:50 -0500 X-WSS-ID: 0L85ZJL-01-2GH-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 2331610285D6; Fri, 3 Sep 2010 04:26:08 -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; Fri, 3 Sep 2010 04:26:12 -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; Fri, 3 Sep 2010 05:26:10 -0400 Received: from localhost.localdomain (tronje.osrc.amd.com [165.204.15.48]) by gwo.osrc.amd.com (Postfix) with ESMTP id 5E62949C0E9; Fri, 3 Sep 2010 10:26:10 +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: Fri, 3 Sep 2010 11:27:46 +0200 Message-ID: <1283506069-1096-2-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1283506069-1096-1-git-send-email-andre.przywara@amd.com> References: <1283506069-1096-1-git-send-email-andre.przywara@amd.com> MIME-Version: 1.0 X-Reverse-DNS: ausb3extmailp02.amd.com 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]); Fri, 03 Sep 2010 09:37:53 +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 */