Merge branch 'linus' into x86/cleanups

diff --combined arch/x86/kernel/apic.c
index 3a961bd9f619d6ed70c3c90f7c0b12cf8764f23d,b5229affb95397cf8dbab2f49ab823497f8ba531..c67722f010bde3492cf30973907a8390a0e87cb4
--- 1/arch/x86/kernel/apic.c
--- 2/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@@ -30,6 -30,7 +30,7 @@@
  #include <linux/module.h>
  #include <linux/dmi.h>
  #include <linux/dmar.h>
+ #include <linux/ftrace.h>
  
  #include <asm/atomic.h>
  #include <asm/smp.h>
@@@ -97,8 -98,8 +98,8 @@@ __setup("apicpmtimer", setup_apicpmtime
  #ifdef HAVE_X2APIC
  int x2apic;
  /* x2apic enabled before OS handover */
 -int x2apic_preenabled;
 -int disable_x2apic;
 +static int x2apic_preenabled;
 +static int disable_x2apic;
  static __init int setup_nox2apic(char *str)
  {
        disable_x2apic = 1;
@@@ -790,7 -791,7 +791,7 @@@ static void local_apic_timer_interrupt(
   * [ if a single-CPU system runs an SMP kernel then we call the local
   *   interrupt as well. Thus we cannot inline the local irq ... ]
   */
- void smp_apic_timer_interrupt(struct pt_regs *regs)
+ void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)
  {
        struct pt_regs *old_regs = set_irq_regs(regs);