diff --git a/[refs] b/[refs]
index 63e24f017aff..072da38b3113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e84911c6c37fd1080ef07039e19c346628b31db
+refs/heads/master: 2b97df06ce44b1d145bd1299f50765803c2fabee
diff --git a/trunk/include/asm-x86/apic.h b/trunk/include/asm-x86/apic.h
index 133c998161ca..519ad65708e7 100644
--- a/trunk/include/asm-x86/apic.h
+++ b/trunk/include/asm-x86/apic.h
@@ -54,6 +54,11 @@ extern int disable_apic;
 #endif
 
 extern int is_vsmp_box(void);
+extern void xapic_wait_icr_idle(void);
+extern u32 safe_xapic_wait_icr_idle(void);
+extern u64 xapic_icr_read(void);
+extern void xapic_icr_write(u32, u32);
+extern int setup_profiling_timer(unsigned int);
 
 static inline void native_apic_write(unsigned long reg, u32 v)
 {
diff --git a/trunk/include/asm-x86/hw_irq.h b/trunk/include/asm-x86/hw_irq.h
index 77ba51df5668..40b941ac81ca 100644
--- a/trunk/include/asm-x86/hw_irq.h
+++ b/trunk/include/asm-x86/hw_irq.h
@@ -93,6 +93,16 @@ extern asmlinkage void qic_reschedule_interrupt(void);
 extern asmlinkage void qic_enable_irq_interrupt(void);
 extern asmlinkage void qic_call_function_interrupt(void);
 
+/* SMP */
+extern void smp_apic_timer_interrupt(struct pt_regs *);
+#ifdef CONFIG_X86_32
+extern void smp_spurious_interrupt(struct pt_regs *);
+extern void smp_error_interrupt(struct pt_regs *);
+#else
+extern asmlinkage void smp_spurious_interrupt(void);
+extern asmlinkage void smp_error_interrupt(void);
+#endif
+
 #ifdef CONFIG_X86_32
 extern void (*const interrupt[NR_IRQS])(void);
 #else