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 dc9641895abb ("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 <sfr@canb.auug.org.au>
Signed-off-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 6 insertions, 2 deletions

diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c
index da711e37fc97..6a61deed4a85 100644
--- a/arch/alpha/kernel/console.c
+++ b/arch/alpha/kernel/console.c
@@ -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
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index ab80a80d38a2..f2360a74e5d5 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -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);