Commit 143c2ce2 authored by Arvind Sankar's avatar Arvind Sankar Committed by Greg Kroah-Hartman
Browse files

arch/m68k/setup: Drop dummy_con initialization 



con_init in tty/vt.c will now set conswitchp to dummy_con if it's unset.
Drop it from arch setup code.

Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20191218214506.49252-11-nivedita@alum.mit.edu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b448f12

arch/m68k/kernel/setup_mm.c

+0 −4
Original line number Diff line number Diff line
@@ -274,10 +274,6 @@ void __init setup_arch(char **cmdline_p) 


	parse_early_param();



#ifdef CONFIG_DUMMY_CONSOLE

	conswitchp = &dummy_con;

#endif



	switch (m68k_machtype) {

#ifdef CONFIG_AMIGA

	case MACH_AMIGA:

arch/m68k/kernel/setup_no.c

+0 −4
Original line number Diff line number Diff line
@@ -146,10 +146,6 @@ void __init setup_arch(char **cmdline_p) 
	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);

	boot_command_line[COMMAND_LINE_SIZE-1] = 0;



#if defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_DUMMY_CONSOLE)

	conswitchp = &dummy_con;

#endif



	/*

	 * Give all the memory to the bootmap allocator, tell it to put the

	 * boot mem_map at the start of memory.

arch/m68k/sun3x/config.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ void __init config_sun3x(void) 
		break;

	default:

		serial_console = 0;

		conswitchp = &dummy_con;

		break;

	}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE