forked from Minki/linux
arch/powerpc/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: Arvind Sankar <nivedita@alum.mit.edu> Link: https://lore.kernel.org/r/20191218214506.49252-18-nivedita@alum.mit.edu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
82292aaede
commit
4c82266d15
@ -949,9 +949,6 @@ void __init setup_arch(char **cmdline_p)
|
||||
|
||||
early_memtest(min_low_pfn << PAGE_SHIFT, max_low_pfn << PAGE_SHIFT);
|
||||
|
||||
if (IS_ENABLED(CONFIG_DUMMY_CONSOLE))
|
||||
conswitchp = &dummy_con;
|
||||
|
||||
if (ppc_md.setup_arch)
|
||||
ppc_md.setup_arch();
|
||||
|
||||
|
@ -240,9 +240,6 @@ static void __init cell_setup_arch(void)
|
||||
init_pci_config_tokens();
|
||||
|
||||
cbe_pervasive_init();
|
||||
#ifdef CONFIG_DUMMY_CONSOLE
|
||||
conswitchp = &dummy_con;
|
||||
#endif
|
||||
|
||||
mmio_nvram_init();
|
||||
}
|
||||
|
@ -183,9 +183,6 @@ static void __init maple_setup_arch(void)
|
||||
/* Lookup PCI hosts */
|
||||
maple_pci_init();
|
||||
|
||||
#ifdef CONFIG_DUMMY_CONSOLE
|
||||
conswitchp = &dummy_con;
|
||||
#endif
|
||||
maple_use_rtas_reboot_and_halt_if_present();
|
||||
|
||||
printk(KERN_DEBUG "Using native/NAP idle loop\n");
|
||||
|
@ -147,10 +147,6 @@ static void __init pas_setup_arch(void)
|
||||
/* Lookup PCI hosts */
|
||||
pas_pci_init();
|
||||
|
||||
#ifdef CONFIG_DUMMY_CONSOLE
|
||||
conswitchp = &dummy_con;
|
||||
#endif
|
||||
|
||||
/* Remap SDC register for doing reset */
|
||||
/* XXXOJN This should maybe come out of the device tree */
|
||||
reset_reg = ioremap(0xfc101100, 4);
|
||||
|
@ -200,10 +200,6 @@ static void __init ps3_setup_arch(void)
|
||||
smp_init_ps3();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DUMMY_CONSOLE
|
||||
conswitchp = &dummy_con;
|
||||
#endif
|
||||
|
||||
prealloc_ps3fb_videomemory();
|
||||
prealloc_ps3flash_bounce_buffer();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user