Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67d11284 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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
parents d3f15800 2576c999

arch/x86/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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>