Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155957f5 authored by Wang YanQing's avatar Wang YanQing Committed by Greg Kroah-Hartman
Browse files

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 dc964189 ("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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarWang YanQing <udknight@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4898e640

arch/alpha/kernel/console.c

+3 −1
Original line number Diff line number Diff line
@@ -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

arch/alpha/kernel/process.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

arch/mips/pci/pci-bcm1480.c

+3 −1
Original line number Diff line number Diff line
@@ -257,7 +257,9 @@ static int __init bcm1480_pcibios_init(void) 
	register_pci_controller(&bcm1480_controller);



#ifdef CONFIG_VGA_CONSOLE

	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();

#endif

	return 0;

}

arch/mips/pci/pci-sb1250.c

+3 −1
Original line number Diff line number Diff line
@@ -283,7 +283,9 @@ static int __init sb1250_pcibios_init(void) 
	register_pci_controller(&sb1250_controller);



#ifdef CONFIG_VGA_CONSOLE

	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();

#endif

	return 0;

}

arch/parisc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ void __init setup_arch(char **cmdline_p) 
#endif



#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)

	conswitchp = &dummy_con;	/* we use take_over_console() later ! */

	conswitchp = &dummy_con;	/* we use do_take_over_console() later ! */

#endif



}