From f03450523bc3d48ffdd9ab5917572583f8be6ae1 Mon Sep 17 00:00:00 2001
From: Wu Zhangjin <wuzhangjin@gmail.com>
Date: Wed, 10 Mar 2010 00:27:28 +0800
Subject: [PATCH] --- yaml --- r: 189765 b: refs/heads/master c:
 7a7ac952d5217b2f568e5ef91ac39b572e166f24 h: refs/heads/master i:   189763:
 e6004671df58fdc86b3600c8323703480cffe269 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mips/kernel/process.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c74ec35474b1..7f663c5ef342 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abe5b417fb4a52e9510fdb5a16e722e91bf89e92
+refs/heads/master: 7a7ac952d5217b2f568e5ef91ac39b572e166f24
diff --git a/trunk/arch/mips/kernel/process.c b/trunk/arch/mips/kernel/process.c
index 463b71b90a00..99960940d4a4 100644
--- a/trunk/arch/mips/kernel/process.c
+++ b/trunk/arch/mips/kernel/process.c
@@ -63,8 +63,13 @@ void __noreturn cpu_idle(void)
 
 			smtc_idle_loop_hook();
 #endif
-			if (cpu_wait)
+
+			if (cpu_wait) {
+				/* Don't trace irqs off for idle */
+				stop_critical_timings();
 				(*cpu_wait)();
+				start_critical_timings();
+			}
 		}
 #ifdef CONFIG_HOTPLUG_CPU
 		if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map) &&