From 3ac5b4172941da5339abe3fc147144a6645f811e Mon Sep 17 00:00:00 2001
From: Yong Zhang <yong.zhang@windriver.com>
Date: Thu, 19 Jul 2012 09:13:53 +0200
Subject: [PATCH] --- yaml --- r: 312141 b: refs/heads/master c:
 b789ad63ac46b00f0862bdc23fc95556adc3cf2f h: refs/heads/master i:   312139:
 99be91b5859e82fb95142fa402d66a36929669a6 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/mips/kernel/smp.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22af3a5dd05c..8319c4facf83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9a09a0660aa9174e489ac531244680971950ef8
+refs/heads/master: b789ad63ac46b00f0862bdc23fc95556adc3cf2f
diff --git a/trunk/arch/mips/kernel/smp.c b/trunk/arch/mips/kernel/smp.c
index eb3e2b112a0d..1268392f1d27 100644
--- a/trunk/arch/mips/kernel/smp.c
+++ b/trunk/arch/mips/kernel/smp.c
@@ -130,6 +130,11 @@ asmlinkage __cpuinit void start_secondary(void)
 
 	synchronise_count_slave();
 
+	/*
+	 * irq will be enabled in ->smp_finish(), enabling it too early
+	 * is dangerous.
+	 */
+	WARN_ON_ONCE(!irqs_disabled());
 	mp_ops->smp_finish();
 
 	cpu_idle();