Skip to contentSkip to conversation

x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature

PATCH Applied Venki Pallipadi 2 participants 2 messages Oct 7, 2008 – Oct 9, 2008

lore
Share & tools
lore

Venki Pallipadi

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 include/asm-x86/cpufeature.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-x86/cpufeature.h +1 -1
Index: tip/include/asm-x86/cpufeature.h
===================================================================
@@ -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 */