| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 7 Oct 2008 13:33:12 -0700 From: Venki Pallipadi <venkatesh.pallipadi@...el.com> To: Ingo Molnar <mingo@...e.hu>, Thomas Gleixner <tglx@...utronix.de>, "H. Peter Anvin" <hpa@...or.com> Cc: linux-kernel <linux-kernel@...r.kernel.org> 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@...el.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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists