diff options
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index c734f9b1263a..50590c7f2c01 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -194,10 +194,11 @@ static DECLARE_WORK(console_work, console_callback); | |||
194 | int fg_console; | 194 | int fg_console; |
195 | int last_console; | 195 | int last_console; |
196 | int want_console = -1; | 196 | int want_console = -1; |
197 | int saved_fg_console; | 197 | static int saved_fg_console; |
198 | int saved_last_console; | 198 | static int saved_last_console; |
199 | int saved_want_console; | 199 | static int saved_want_console; |
200 | int saved_vc_mode; | 200 | static int saved_vc_mode; |
201 | static int saved_console_blanked; | ||
201 | 202 | ||
202 | /* | 203 | /* |
203 | * For each existing display, we have a pointer to console currently visible | 204 | * For each existing display, we have a pointer to console currently visible |
@@ -3449,6 +3450,7 @@ int con_debug_enter(struct vc_data *vc) | |||
3449 | saved_last_console = last_console; | 3450 | saved_last_console = last_console; |
3450 | saved_want_console = want_console; | 3451 | saved_want_console = want_console; |
3451 | saved_vc_mode = vc->vc_mode; | 3452 | saved_vc_mode = vc->vc_mode; |
3453 | saved_console_blanked = console_blanked; | ||
3452 | vc->vc_mode = KD_TEXT; | 3454 | vc->vc_mode = KD_TEXT; |
3453 | console_blanked = 0; | 3455 | console_blanked = 0; |
3454 | if (vc->vc_sw->con_debug_enter) | 3456 | if (vc->vc_sw->con_debug_enter) |
@@ -3492,6 +3494,7 @@ int con_debug_leave(void) | |||
3492 | fg_console = saved_fg_console; | 3494 | fg_console = saved_fg_console; |
3493 | last_console = saved_last_console; | 3495 | last_console = saved_last_console; |
3494 | want_console = saved_want_console; | 3496 | want_console = saved_want_console; |
3497 | console_blanked = saved_console_blanked; | ||
3495 | vc_cons[fg_console].d->vc_mode = saved_vc_mode; | 3498 | vc_cons[fg_console].d->vc_mode = saved_vc_mode; |
3496 | 3499 | ||
3497 | vc = vc_cons[fg_console].d; | 3500 | vc = vc_cons[fg_console].d; |