Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus

[platform/adaptation/renesas_rcar/renesas_kernel.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 80aed44..8ed89a1 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -97,7 +97,7 @@ void panic(const char *fmt, ...)
        /*
         * Avoid nested stack-dumping if a panic occurs during oops processing
         */
-       if (!oops_in_progress)
+       if (!test_taint(TAINT_DIE) && oops_in_progress <= 1)
                dump_stack();
 #endif