At panic time (i.e. when oops_in_progress is set) we should try a bit harder to update the screen and make sure output gets to the VT, since some drivers are capable of flipping back to it.
So make sure we try to unblank and update the display if called from a panic context.
Signed-off-by: Jesse Barnes jbarnes@virtuousgeek.org --- drivers/char/vt.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index bd1d116..29ec1c9 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -698,7 +698,10 @@ void redraw_screen(struct vc_data *vc, int is_switch) update_attr(vc); clear_buffer_attributes(vc); } - if (update && vc->vc_mode != KD_GRAPHICS) + + /* Forcibly update if we're panicing */ + if ((update && vc->vc_mode != KD_GRAPHICS) || + oops_in_progress) do_update_region(vc, vc->vc_origin, vc->vc_screenbuf_size / 2); } set_cursor(vc); @@ -2498,7 +2501,7 @@ static void vt_console_print(struct console *co, const char *b, unsigned count) goto quit; }
- if (vc->vc_mode != KD_TEXT) + if (vc->vc_mode != KD_TEXT && !oops_in_progress) goto quit;
/* undraw cursor first */ @@ -3703,7 +3706,8 @@ void do_unblank_screen(int leaving_gfx) return; } vc = vc_cons[fg_console].d; - if (vc->vc_mode != KD_TEXT) + /* Try to unblank in oops case too */ + if (vc->vc_mode != KD_TEXT && !oops_in_progress) return; /* but leave console_blanked != 0 */
if (blankinterval) { @@ -3712,7 +3716,7 @@ void do_unblank_screen(int leaving_gfx) }
console_blanked = 0; - if (vc->vc_sw->con_blank(vc, 0, leaving_gfx)) + if (vc->vc_sw->con_blank(vc, 0, leaving_gfx) || oops_in_progress) /* Low-level driver cannot restore -> do it ourselves */ update_screen(vc); if (console_blank_hook)