Merge branch 'linus' into x86/mce3
Ingo Molnar [Thu, 11 Jun 2009 21:31:52 +0000 (23:31 +0200)]
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>

17 files changed:
1  2 
Documentation/x86/x86_64/boot-options.txt
arch/x86/Kconfig
arch/x86/include/asm/entry_arch.h
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/irq_vectors.h
arch/x86/include/asm/msr-index.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/nmi.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/irq.c
arch/x86/kernel/irqinit.c
arch/x86/kernel/signal.c
arch/x86/kernel/smp.c
arch/x86/kernel/traps.c
kernel/timer.c

Simple merge
@@@ -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
  
Simple merge
Simple merge
  #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
Simple merge
Simple merge
Simple merge
  #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;
Simple merge
@@@ -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;
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/timer.c
Simple merge