lkml.org 
[lkml]   [2008]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature

Fix two features from conflicting in feature bits. Looks like the conflict
came from automatic conflict resolution?

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

---
include/asm-x86/cpufeature.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: tip/include/asm-x86/cpufeature.h
===================================================================
--- tip.orig/include/asm-x86/cpufeature.h 2008-10-07 13:04:01.000000000 -0700
+++ tip/include/asm-x86/cpufeature.h 2008-10-07 13:05:51.000000000 -0700
@@ -90,7 +90,7 @@
#define X86_FEATURE_11AP (3*32+19) /* "" Bad local APIC aka 11AP */
#define X86_FEATURE_NOPL (3*32+20) /* The NOPL (0F 1F) instructions */
#define X86_FEATURE_AMDC1E (3*32+21) /* AMD C1E detected */
-#define X86_FEATURE_XTOPOLOGY (3*32+21) /* cpu topology enum extensions */
+#define X86_FEATURE_XTOPOLOGY (3*32+22) /* cpu topology enum extensions */

/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
#define X86_FEATURE_XMM3 (4*32+ 0) /* "pni" SSE-3 */

\
 
 \ /
  Last update: 2008-10-07 22:37    [W:0.030 / U:2.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site