tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix AMDC1E and XTOPOLOGY conflict in cpufeature
x86: build fix

Linus Torvalds 67d11284 d3f15800

+2 -1
unified split
+1 -1
arch/x86/include/asm/cpufeature.h
··· 91 91 #define X86_FEATURE_11AP (3*32+19) /* "" Bad local APIC aka 11AP */ 92 92 #define X86_FEATURE_NOPL (3*32+20) /* The NOPL (0F 1F) instructions */ 93 93 #define X86_FEATURE_AMDC1E (3*32+21) /* AMD C1E detected */ 94 - #define X86_FEATURE_XTOPOLOGY (3*32+21) /* cpu topology enum extensions */ 94 + #define X86_FEATURE_XTOPOLOGY (3*32+22) /* cpu topology enum extensions */ 95 95 96 96 /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ 97 97 #define X86_FEATURE_XMM3 (4*32+ 0) /* "pni" SSE-3 */
+1
arch/x86/kernel/cpu/common.c
··· 20 20 #include <asm/pat.h> 21 21 #include <asm/asm.h> 22 22 #include <asm/numa.h> 23 + #include <asm/smp.h> 23 24 #ifdef CONFIG_X86_LOCAL_APIC 24 25 #include <asm/mpspec.h> 25 26 #include <asm/apic.h>