x86 fixes
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
Ingo
------------------>
Ingo Molnar (1):
x86: build fix
Venki Pallipadi (1):
x86: fix AMDC1E and XTOPOLOGY conflict in cpufeature
arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/kernel/cpu/common.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/include/asm/cpufeature.h +1 -1
@@ -91,7 +91,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 */
arch/x86/kernel/cpu/common.c +1 -0
@@ -20,6 +20,7 @@#include <asm/pat.h> #include <asm/asm.h> #include <asm/numa.h> +#include <asm/smp.h> #ifdef CONFIG_X86_LOCAL_APIC #include <asm/mpspec.h> #include <asm/apic.h>