[PATCH] fbcon: assume console is active if panicing

[Jesse Barnes <jbarnes@virtuousgeek.org>]

This allows us to draw to the fbcon buffer in a panic situation, in case
the low level driver can flip to it at panic time.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/video/console/fbcon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index b0a3fa0..6ca1051 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -283,7 +283,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
 	struct fbcon_ops *ops = info->fbcon_par;
 
 	return (info->state != FBINFO_STATE_RUNNING ||
-		vc->vc_mode != KD_TEXT || ops->graphics);
+		vc->vc_mode != KD_TEXT || ops->graphics) && !oops_in_progress;
 }
 
 static inline int get_color(struct vc_data *vc, struct fb_info *info,
-- 
1.6.6.1