diff --git a/[refs] b/[refs]
index 2aa5777724cc..c5ec636ea05a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd171d5ffc5cb2ba471e8205c679ee9d12b90116
+refs/heads/master: bdff78707f3ce47e891f3201c9666122a70556ce
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 984b3ecbd72c..512ab73b0ca3 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -301,6 +301,7 @@ int oops_may_print(void)
  */
 void oops_enter(void)
 {
+	tracing_off();
 	/* can't trust the integrity of the kernel anymore: */
 	debug_locks_off();
 	do_oops_enter_exit();