---

yaml --- r: 260431 b: refs/heads/master c: c958474 h: refs/heads/master i: 260429: 578c3f6 260427: 073bd8a 260423: 1007b21 260415: 63e4b99 v: v3
git-mirror · Jul 26, 2011 · 30fc3a3 · 30fc3a3
1 parent e432e8b
commit 30fc3a3
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: 4302fbc8ec2ccae279c939f241bf8ce64e1a0bb7
+refs/heads/master: c958474b6d721ff09e4abf143efc07365d63aea5
diff --git a/trunk/include/linux/vt_kern.h b/trunk/include/linux/vt_kern.h
@@ -137,7 +137,7 @@ int vty_init(const struct file_operations *console_fops);
 
 static inline bool vt_force_oops_output(struct vc_data *vc)
 {
-	if (oops_in_progress && vc->vc_panic_force_write)
+	if (oops_in_progress && vc->vc_panic_force_write  && panic_timeout >= 0)
 		return true;
 	return false;
 }