Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[~andy/linux] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 984b3ecbd72c5ca791e501e18d09c47862b677ad..512ab73b0ca3afed1553b5e01218c92d17630a4c 100644 (file)
--- a/kernel/panic.c
+++ b/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();