From 30fc3a3e8c9f941cb1c352a39647b17abe53b279 Mon Sep 17 00:00:00 2001 From: Mandeep Singh Baines Date: Tue, 26 Jul 2011 16:08:54 -0700 Subject: [PATCH] --- yaml --- r: 260431 b: refs/heads/master c: c958474b6d721ff09e4abf143efc07365d63aea5 h: refs/heads/master i: 260429: 578c3f67f242be43b3c5b5b63433f72c93147d19 260427: 073bd8a3bcbd3dae9b2a6bce8a01b5d46b832964 260423: 1007b21d71ec002e4c03966014a0ed4140097c48 260415: 63e4b990358c99181fec51ed12fcaae7cff1863b v: v3 --- [refs] | 2 +- trunk/include/linux/vt_kern.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e66a1fc8c63..112cdaaf3d97 100644 --- 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 index 4d05e14ea60c..c2164fad0083 100644 --- 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; }