Merge branch 'linus' into x86/nmi

Conflicts:

	arch/x86/kernel/nmi_32.c

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index f15fc93d6b35..ba5cdebeaf0d 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -176,11 +176,14 @@ static void ip27_send_ipi_mask(cpumask_t mask, unsigned int action)
 static void __cpuinit ip27_init_secondary(void)
 {
         per_cpu_init();
-        local_irq_enable();
 }
 
 static void __cpuinit ip27_smp_finish(void)
 {
+        extern void hub_rt_clock_event_init(void);
+
+        hub_rt_clock_event_init();
+        local_irq_enable();
 }
 
 static void __init ip27_cpus_done(void)