Merge branch 'x86/core' into x86/mce2

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/configs/i386_defconfig
Simple merge

diff --cc arch/x86/configs/x86_64_defconfig
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
index 57b53774d9860055ecddb3dbfca88bb386cec2b9,f9cecdfd05c5523cb6298a27a3d03706e92fb21a..30909a258d0fbc92165857629f4c492499907430
--- 1/arch/x86/kernel/apic.c
--- 2/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -14,52 -14,69 +14,70 @@@
   *    Mikael Pettersson       :       PM converted to driver model.
   */
  
- #include <linux/init.h>
- 
- #include <linux/mm.h>
- #include <linux/delay.h>
- #include <linux/bootmem.h>
- #include <linux/interrupt.h>
- #include <linux/mc146818rtc.h>
  #include <linux/kernel_stat.h>
- #include <linux/sysdev.h>
- #include <linux/ioport.h>
- #include <linux/cpu.h>
- #include <linux/clockchips.h>
+ #include <linux/mc146818rtc.h>
  #include <linux/acpi_pmtmr.h>
+ #include <linux/clockchips.h>
+ #include <linux/interrupt.h>
+ #include <linux/bootmem.h>
+ #include <linux/ftrace.h>
+ #include <linux/ioport.h>
  #include <linux/module.h>
- #include <linux/dmi.h>
+ #include <linux/sysdev.h>
+ #include <linux/delay.h>
+ #include <linux/timex.h>
  #include <linux/dmar.h>
- #include <linux/ftrace.h>
- #include <linux/smp.h>
+ #include <linux/init.h>
+ #include <linux/cpu.h>
+ #include <linux/dmi.h>
  #include <linux/nmi.h>
- #include <linux/timex.h>
+ #include <linux/smp.h>
+ #include <linux/mm.h>
  
+ #include <asm/pgalloc.h>
  #include <asm/atomic.h>
- #include <asm/mtrr.h>
  #include <asm/mpspec.h>
- #include <asm/desc.h>
- #include <asm/arch_hooks.h>
- #include <asm/hpet.h>
- #include <asm/pgalloc.h>
  #include <asm/i8253.h>
- #include <asm/idle.h>
+ #include <asm/i8259.h>
  #include <asm/proto.h>
  #include <asm/apic.h>
- #include <asm/i8259.h>
+ #include <asm/desc.h>
+ #include <asm/hpet.h>
+ #include <asm/idle.h>
+ #include <asm/mtrr.h>
  #include <asm/smp.h>
 +#include <asm/mce.h>
  
- #include <mach_apic.h>
- #include <mach_apicdef.h>
- #include <mach_ipi.h>
+ unsigned int num_processors;
+ 
+ unsigned disabled_cpus __cpuinitdata;
+ 
+ /* Processor that is doing the boot up */
+ unsigned int boot_cpu_physical_apicid = -1U;
+ 
+ /*
+  * The highest APIC ID seen during enumeration.
+  *
+  * This determines the messaging protocol we can use: if all APIC IDs
+  * are in the 0 ... 7 range, then we can use logical addressing which
+  * has some performance advantages (better broadcasting).
+  *
+  * If there's an APIC ID above 8, we use physical addressing.
+  */
+ unsigned int max_physical_apicid;
  
  /*
-  * Sanity check
+  * Bitmask of physically existing CPUs:
   */
- #if ((SPURIOUS_APIC_VECTOR & 0x0F) != 0x0F)
- # error SPURIOUS_APIC_VECTOR definition error
- #endif
+ physid_mask_t phys_cpu_present_map;
+ 
+ /*
+  * Map cpu index to physical APIC ID
+  */
+ DEFINE_EARLY_PER_CPU(u16, x86_cpu_to_apicid, BAD_APICID);
+ DEFINE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid, BAD_APICID);
+ EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid);
+ EXPORT_EARLY_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
  
  #ifdef CONFIG_X86_32
  /*

diff --cc arch/x86/kernel/cpu/mcheck/mce_amd_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_intel_64.c
Simple merge