* [PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature
@ 2008-10-07 20:33 Venki Pallipadi
2008-10-09 20:46 ` H. Peter Anvin
0 siblings, 1 reply; 2+ messages in thread
From: Venki Pallipadi @ 2008-10-07 20:33 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel
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 */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature
2008-10-07 20:33 [PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature Venki Pallipadi
@ 2008-10-09 20:46 ` H. Peter Anvin
0 siblings, 0 replies; 2+ messages in thread
From: H. Peter Anvin @ 2008-10-09 20:46 UTC (permalink / raw)
To: Venki Pallipadi; +Cc: Ingo Molnar, Thomas Gleixner, linux-kernel
Venki Pallipadi wrote:
> 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>
Applied to x86/cpu, thanks!
-hpa
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-10-09 20:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-07 20:33 [PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature Venki Pallipadi
2008-10-09 20:46 ` H. Peter Anvin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).