---

yaml --- r: 299069 b: refs/heads/master c: 026ee1f h: refs/heads/master i: 299067: 784ce4d v: v3
git-mirror · Apr 12, 2012 · defef09 · defef09
1 parent d758c08
commit defef09
Show file tree

Hide file tree

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