mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
TTY:vt: convert remain take_over_console's users to do_take_over_console
Impact:
1:convert all remain take_over_console to do_take_over_console
2:update take_over_console to do_take_over_console in comment
Commit dc9641895a ("vt: delete unneeded functions
register_con_driver|take_over_console") delete take_over_console,
but forget to convert remain take_over_console's users to new API
do_take_over_console, this patch fix it.
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Wang YanQing <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
4898e640ca
commit
155957f56c
11 changed files with 43 additions and 20 deletions
|
|
@ -61,7 +61,9 @@ locate_and_init_vga(void *(*sel_func)(void *, void *))
|
|||
|
||||
/* Set the VGA hose and init the new console. */
|
||||
pci_vga_hose = hose;
|
||||
take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
|
||||
console_lock();
|
||||
do_take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
|
||||
console_unlock();
|
||||
}
|
||||
|
||||
void __init
|
||||
|
|
|
|||
|
|
@ -117,7 +117,9 @@ common_shutdown_1(void *generic_ptr)
|
|||
if (in_interrupt())
|
||||
irq_exit();
|
||||
/* This has the effect of resetting the VGA video origin. */
|
||||
take_over_console(&dummy_con, 0, MAX_NR_CONSOLES-1, 1);
|
||||
console_lock();
|
||||
do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES-1, 1);
|
||||
console_unlock();
|
||||
#endif
|
||||
pci_restore_srm_config();
|
||||
set_hae(srm_hae);
|
||||
|
|
|
|||
Loading…
Reference in a new issue