From defef091d245766fb877ad95aaa0493d99b90629 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Thu, 12 Apr 2012 12:49:17 -0700
Subject: [PATCH] --- yaml --- r: 299069 b: refs/heads/master c:
 026ee1f66aaa7f01b617a0ba89ac4b531f9603f1 h: refs/heads/master i:   299067:
 784ce4d3a67f20d5aa15a4495f3862e9da2fe775 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/panic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 13ae774bd2fe..4b9eceeb1f2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f3972168353d355854d6381f1f360ce83b723e5
+refs/heads/master: 026ee1f66aaa7f01b617a0ba89ac4b531f9603f1
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 80aed44e345a..8ed89a175d79 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/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