Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
vt,console,kdb: preserve console_blanked while in kdb
Commit b45cfba4e9005d64d419718e7ff7f7cab44c1994 (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>
+3
drivers/char/vt.c
+3
drivers/char/vt.c
···
198
198
static int saved_last_console;
199
199
static int saved_want_console;
200
200
static int saved_vc_mode;
201
+
static int saved_console_blanked;
201
202
202
203
/*
203
204
* For each existing display, we have a pointer to console currently visible
···
3450
3449
saved_last_console = last_console;
3451
3450
saved_want_console = want_console;
3452
3451
saved_vc_mode = vc->vc_mode;
3452
+
saved_console_blanked = console_blanked;
3453
3453
vc->vc_mode = KD_TEXT;
3454
3454
console_blanked = 0;
3455
3455
if (vc->vc_sw->con_debug_enter)
···
3494
3492
fg_console = saved_fg_console;
3495
3493
last_console = saved_last_console;
3496
3494
want_console = saved_want_console;
3495
+
console_blanked = saved_console_blanked;
3497
3496
vc_cons[fg_console].d->vc_mode = saved_vc_mode;
3498
3497
3499
3498
vc = vc_cons[fg_console].d;