From: Venki Pallipadi <venkatesh.pallipadi@intel.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature
Date: Tue, 7 Oct 2008 13:33:12 -0700 [thread overview]
Message-ID: <20081007203311.GA31189@linux-os.sc.intel.com> (raw)
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 */
next reply other threads:[~2008-10-07 20:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-07 20:33 Venki Pallipadi [this message]
2008-10-09 20:46 ` [PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081007203311.GA31189@linux-os.sc.intel.com \
--to=venkatesh.pallipadi@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox