From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 11 Jun 2009 21:31:52 +0000 (+0200)
Subject: Merge branch 'linus' into x86/mce3
X-Git-Tag: v2.6.31-rc1~349^2
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=0d5959723e1db3fd7323c198a50c16cecf96c7a9

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>
---

0d5959723e1db3fd7323c198a50c16cecf96c7a9
diff --cc arch/x86/include/asm/entry_arch.h
index 69f886805ecb,d750a10ccad6..ff8cbfa07851
--- a/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/irq_vectors.h
index 1b35c4357ea8,e997be98c9b9..5b21f0ec3df2
--- a/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/kernel/cpu/mcheck/mce_intel_64.c
index 046087e9808f,65a0fceedcd7..f2ef6952c400
--- a/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/irq.c
index 9773395aa758,38287b5f116e..b0cdde6932f5
--- a/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;