Merge branch 'x86/irq' into x86/core

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

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

diff --cc arch/x86/kernel/time_64.c
index 1b7711b31037ed034ccf55defc306ab35bfc74ba,1749cacde8b99b4ec30735e3b822e677cc425fd5..891e7a7c4334086b1949444944236c241147e930
--- 1/arch/x86/kernel/time_64.c
--- 2/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@@ -49,9 -49,9 +49,9 @@@ unsigned long profile_pc(struct pt_reg
  }
  EXPORT_SYMBOL(profile_pc);
  
 -irqreturn_t timer_interrupt(int irq, void *dev_id)
 +static irqreturn_t timer_interrupt(int irq, void *dev_id)
  {
-       add_pda(irq0_irqs, 1);
+       inc_irq_stat(irq0_irqs);
  
        global_clock_event->event_handler(global_clock_event);
  

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

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