Skip to content

Commit 4c82266

Browse files
nivedita76gregkh
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 82292aa commit 4c82266

File tree

5 files changed

+0
-17
lines changed

5 files changed

+0
-17
lines changed

arch/powerpc/kernel/setup-common.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -949,9 +949,6 @@ void __init setup_arch(char **cmdline_p)
949949

950950
early_memtest(min_low_pfn << PAGE_SHIFT, max_low_pfn << PAGE_SHIFT);
951951

952-
if (IS_ENABLED(CONFIG_DUMMY_CONSOLE))
953-
conswitchp = &dummy_con;
954-
955952
if (ppc_md.setup_arch)
956953
ppc_md.setup_arch();
957954

arch/powerpc/platforms/cell/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,6 @@ static void __init cell_setup_arch(void)
240240
init_pci_config_tokens();
241241

242242
cbe_pervasive_init();
243-
#ifdef CONFIG_DUMMY_CONSOLE
244-
conswitchp = &dummy_con;
245-
#endif
246243

247244
mmio_nvram_init();
248245
}

arch/powerpc/platforms/maple/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ static void __init maple_setup_arch(void)
183183
/* Lookup PCI hosts */
184184
maple_pci_init();
185185

186-
#ifdef CONFIG_DUMMY_CONSOLE
187-
conswitchp = &dummy_con;
188-
#endif
189186
maple_use_rtas_reboot_and_halt_if_present();
190187

191188
printk(KERN_DEBUG "Using native/NAP idle loop\n");

arch/powerpc/platforms/pasemi/setup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ static void __init pas_setup_arch(void)
147147
/* Lookup PCI hosts */
148148
pas_pci_init();
149149

150-
#ifdef CONFIG_DUMMY_CONSOLE
151-
conswitchp = &dummy_con;
152-
#endif
153-
154150
/* Remap SDC register for doing reset */
155151
/* XXXOJN This should maybe come out of the device tree */
156152
reset_reg = ioremap(0xfc101100, 4);

arch/powerpc/platforms/ps3/setup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@ static void __init ps3_setup_arch(void)
200200
smp_init_ps3();
201201
#endif
202202

203-
#ifdef CONFIG_DUMMY_CONSOLE
204-
conswitchp = &dummy_con;
205-
#endif
206-
207203
prealloc_ps3fb_videomemory();
208204
prealloc_ps3flash_bounce_buffer();
209205

0 commit comments

Comments
 (0)