Merge branch 'x86/apic' into x86/irq

Conflicts:
	arch/x86/kernel/apic.c

diff --cc arch/x86/kernel/apic.c
index 1771dd7468116669f39d2707d16900a6b8129a94,fc26ff390f1424cfda1e5e73c209db3fae2233b7..47cbaa237b7b230af1c54a7e495211e36de71828
--- 1/arch/x86/kernel/apic.c
--- 2/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@@ -1691,11 -1681,14 +1677,11 @@@ void smp_spurious_interrupt(struct pt_r
        if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
                ack_APIC_irq();
  
 -#ifdef CONFIG_X86_64
 -      add_pda(irq_spurious_count, 1);
 -#else
 +      inc_irq_stat(irq_spurious_count);
 +
        /* see sw-dev-man vol 3, chapter 7.4.13.5 */
-       printk(KERN_INFO "spurious APIC interrupt on CPU#%d, "
-              "should never happen.\n", smp_processor_id());
+       pr_info("spurious APIC interrupt on CPU#%d, "
+               "should never happen.\n", smp_processor_id());
 -      __get_cpu_var(irq_stat).irq_spurious_count++;
 -#endif
        irq_exit();
  }