---

yaml --- r: 189765 b: refs/heads/master c: 7a7ac95 h: refs/heads/master i: 189763: e600467 v: v3
git-mirror · Apr 12, 2010 · f034505 · f034505
1 parent 496be59
commit f034505
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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) &&