From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 10 Oct 2008 17:50:00 +0000 (+0200)
Subject: Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
X-Git-Tag: v2.6.28-rc1~711^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d84705969f898f294bc3fc32eca33580f14105bd;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/apic_64.c
	arch/x86/kernel/setup.c
	drivers/pci/intel-iommu.c
	include/asm-x86/cpufeature.h
	include/asm-x86/dma-mapping.h
---

d84705969f898f294bc3fc32eca33580f14105bd
diff --cc arch/x86/kernel/setup.c
index 141efab5240,59f07e14d08..46c98efbbf8
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -758,6 -738,9 +758,8 @@@ void __init setup_arch(char **cmdline_p
  #else
  	num_physpages = max_pfn;
  
 -	check_efer();
+  	if (cpu_has_x2apic)
+  		check_x2apic();
  
  	/* How many end-of-memory variables you have, grandma! */
  	/* need this before calling reserve_initrd */
diff --cc include/asm-x86/cpufeature.h
index 250fa0cb144,42afe9ca3a3..065c6a86ed8
--- a/include/asm-x86/cpufeature.h
+++ b/include/asm-x86/cpufeature.h
@@@ -93,7 -91,7 +93,8 @@@
  #define X86_FEATURE_CX16	(4*32+13) /* CMPXCHG16B */
  #define X86_FEATURE_XTPR	(4*32+14) /* Send Task Priority Messages */
  #define X86_FEATURE_DCA		(4*32+18) /* Direct Cache Access */
+ #define X86_FEATURE_X2APIC	(4*32+21) /* x2APIC */
 +#define X86_FEATURE_XMM4_2	(4*32+20) /* Streaming SIMD Extensions-4.2 */
  
  /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */
  #define X86_FEATURE_XSTORE	(5*32+ 2) /* on-CPU RNG present (xstore insn) */
@@@ -192,7 -190,7 +193,8 @@@ extern const char * const x86_power_fla
  #define cpu_has_gbpages		boot_cpu_has(X86_FEATURE_GBPAGES)
  #define cpu_has_arch_perfmon	boot_cpu_has(X86_FEATURE_ARCH_PERFMON)
  #define cpu_has_pat		boot_cpu_has(X86_FEATURE_PAT)
+ #define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)
 +#define cpu_has_xmm4_2		boot_cpu_has(X86_FEATURE_XMM4_2)
  
  #if defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_64)
  # define cpu_has_invlpg		1