mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-19 07:27:50 +00:00
vt,console,kdb: preserve console_blanked while in kdb
Commit b45cfba4e9
(vt,console,kdb:
implement atomic console enter/leave functions) introduced the ability
to atomically change the console mode with kernel mode setting but did
not preserve the state of the console_blanked variable.
The console_blanked variable must be restored when executing the
con_debug_leave() or further kernel mode set changes (such as using
chvt X) will fail to correctly set the state of console.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
CC: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
fed891c89b
commit
beed5336eb
@ -198,6 +198,7 @@ static int saved_fg_console;
|
||||
static int saved_last_console;
|
||||
static int saved_want_console;
|
||||
static int saved_vc_mode;
|
||||
static int saved_console_blanked;
|
||||
|
||||
/*
|
||||
* For each existing display, we have a pointer to console currently visible
|
||||
@ -3449,6 +3450,7 @@ int con_debug_enter(struct vc_data *vc)
|
||||
saved_last_console = last_console;
|
||||
saved_want_console = want_console;
|
||||
saved_vc_mode = vc->vc_mode;
|
||||
saved_console_blanked = console_blanked;
|
||||
vc->vc_mode = KD_TEXT;
|
||||
console_blanked = 0;
|
||||
if (vc->vc_sw->con_debug_enter)
|
||||
@ -3492,6 +3494,7 @@ int con_debug_leave(void)
|
||||
fg_console = saved_fg_console;
|
||||
last_console = saved_last_console;
|
||||
want_console = saved_want_console;
|
||||
console_blanked = saved_console_blanked;
|
||||
vc_cons[fg_console].d->vc_mode = saved_vc_mode;
|
||||
|
||||
vc = vc_cons[fg_console].d;
|
||||
|
Loading…
Reference in New Issue
Block a user