Merge branch 'linus' into x86/mce3

Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc Documentation/x86/x86_64/boot-options.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/entry_arch.h
index 69f886805ecb243a33a774f2118d51c22870b171,d750a10ccad663fe0e8cd5df1d5e5778e12e0d90..ff8cbfa07851a1b2ce121f70b84e4d4269331dfb
--- 1/arch/x86/include/asm/entry_arch.h
--- 2/arch/x86/include/asm/entry_arch.h
+++ b/arch/x86/include/asm/entry_arch.h
@@@ -50,10 -49,10 +50,10 @@@ BUILD_INTERRUPT(error_interrupt,ERROR_A
  BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
  
  #ifdef CONFIG_PERF_COUNTERS
- BUILD_INTERRUPT(perf_counter_interrupt, LOCAL_PERF_VECTOR)
+ BUILD_INTERRUPT(perf_pending_interrupt, LOCAL_PENDING_VECTOR)
  #endif
  
 -#ifdef CONFIG_X86_MCE_P4THERMAL
 +#ifdef CONFIG_X86_THERMAL_VECTOR
  BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR)
  #endif
  

diff --cc arch/x86/include/asm/hardirq.h
Simple merge

diff --cc arch/x86/include/asm/hw_irq.h
Simple merge

diff --cc arch/x86/include/asm/irq_vectors.h
index 1b35c4357ea8f13d4703220241e0b200e14bb53f,e997be98c9b97c166b1b484f5a53b8f171f95b47..5b21f0ec3df258110ce1db5bad0f568577cbb34e
--- 1/arch/x86/include/asm/irq_vectors.h
--- 2/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@@ -104,22 -108,15 +104,22 @@@
  #define LOCAL_TIMER_VECTOR            0xef
  
  /*
-  * Performance monitoring interrupt vector:
+  * Generic system vector for platform specific use
   */
- #define LOCAL_PERF_VECTOR             0xee
+ #define GENERIC_INTERRUPT_VECTOR      0xed
  
  /*
-  * Generic system vector for platform specific use
+  * Performance monitoring pending work vector:
   */
- #define GENERIC_INTERRUPT_VECTOR      0xed
+ #define LOCAL_PENDING_VECTOR          0xec
  
 +#define UV_BAU_MESSAGE                        0xec
 +
 +/*
 + * Self IPI vector for machine checks
 + */
 +#define MCE_SELF_VECTOR                       0xeb
 +
  /*
   * First APIC vector available to drivers: (vectors 0x30-0xee) we
   * start at 0x31(0x41) to spread out vectors evenly between priority

diff --cc arch/x86/include/asm/msr-index.h
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/apic/nmi.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index 046087e9808f1a88584b292db9bdf9c603bc723e,65a0fceedcd77ce7ed0088a5b24b0432caebd990..f2ef6952c4003284c5d0886a299d14ca734ba09c
--- 1/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
--- 2/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@@ -15,10 -15,7 +15,9 @@@
  #include <asm/hw_irq.h>
  #include <asm/idle.h>
  #include <asm/therm_throt.h>
- #include <asm/apic.h>
  
 +#include "mce.h"
 +
  asmlinkage void smp_thermal_interrupt(void)
  {
        __u64 msr_val;

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/irq.c
index 9773395aa758e891df8450dd183edc793f228ed8,38287b5f116e10e4e1bba96cac3d0c30bf842890..b0cdde6932f5ef094d74eae1a80e0e79877a1018
--- 1/arch/x86/kernel/irq.c
--- 2/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@@ -12,7 -12,7 +12,8 @@@
  #include <asm/io_apic.h>
  #include <asm/irq.h>
  #include <asm/idle.h>
 +#include <asm/mce.h>
+ #include <asm/hw_irq.h>
  
  atomic_t irq_err_count;
  

diff --cc arch/x86/kernel/irqinit.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc arch/x86/kernel/smp.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc kernel/timer.c
Simple merge