Merge branch 'x86/core' into perfcounters/core

Conflicts:
	arch/x86/kernel/apic/apic.c
	arch/x86/kernel/irqinit_32.c

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
index d1bf032ba26f9e9527d9da3c5e1caaed27e4e87d,f9cecdfd05c5523cb6298a27a3d03706e92fb21a..4732768c53489d821c4216e4ca972b48c75e5197
--- 1/arch/x86/kernel/apic/apic.c
--- 2/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -34,8 -34,6 +34,7 @@@
  #include <linux/smp.h>
  #include <linux/mm.h>
  
- #include <asm/arch_hooks.h>
 +#include <asm/perf_counter.h>
  #include <asm/pgalloc.h>
  #include <asm/atomic.h>
  #include <asm/mpspec.h>

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

diff --cc arch/x86/kernel/irqinit_32.c
index 520e6c1c5d229abc401c93f094a7e838e403cbc8,50b8c3a3006cb6f22ae0aa0f0cf3a50071475154..f3e11cb295c4d4a060a14bf90a22a74724f55518
--- 1/arch/x86/kernel/irqinit_32.c
--- 2/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@@ -163,40 -178,12 +163,40 @@@ static void __init apic_intr_init(void
        /* IPI vectors for APIC spurious and error interrupts */
        alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);
        alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
 -#endif
 +# ifdef CONFIG_PERF_COUNTERS
 +      alloc_intr_gate(LOCAL_PERF_VECTOR, perf_counter_interrupt);
 +# endif
  
 -#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_MCE_P4THERMAL)
 +# ifdef CONFIG_X86_MCE_P4THERMAL
        /* thermal monitor LVT interrupt */
        alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
 +# endif
  #endif
-       /* all the set up before the call gates are initialised */
-       pre_intr_init_hook();
 +}
 +
 +/* Overridden in paravirt.c */
 +void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));
 +
 +void __init native_init_IRQ(void)
 +{
 +      int i;
 +
++      /* Execute any quirks before the call gates are initialised: */
++      x86_quirk_pre_intr_init();
 +
 +      apic_intr_init();
 +
 +      /*
 +       * Cover the whole vector space, no vector can escape
 +       * us. (some of these will be overridden and become
 +       * 'special' SMP interrupts)
 +       */
 +      for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {
 +              int vector = FIRST_EXTERNAL_VECTOR + i;
 +              /* SYSCALL_VECTOR was reserved in trap_init. */
 +              if (!test_bit(vector, used_vectors))
 +                      set_intr_gate(vector, interrupt[i]);
 +      }
  
        if (!acpi_ioapic)
                setup_irq(2, &irq2);

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

diff --cc kernel/Makefile
Simple merge

diff --cc kernel/sched.c
Simple merge