m68k: Moved initialisation of conswitchp from subarches to global arch setup
Subsystems (4)
PATCH 35/41 m68k: Moved initialisation of conswitchp from subarches to global arch setup
From: Kars de Jong <[email protected]>
Date: 1135272955 -0500
Signed-off-by Kars de Jong <[email protected]>
Signed-off-by Al Viro <[email protected]>
---
arch/m68k/amiga/config.c | 3 --- arch/m68k/apollo/config.c | 3 --- arch/m68k/atari/config.c | 3 --- arch/m68k/hp300/config.c | 3 --- arch/m68k/kernel/setup.c | 4 ++++ arch/m68k/mac/config.c | 3 --- arch/m68k/q40/config.c | 3 --- arch/m68k/sun3/config.c | 3 --- arch/m68k/sun3x/config.c | 4 ---- 9 files changed, 4 insertions(+), 25 deletions(-)
31f02d1f0abb0a189090968d7ae398d3a2066b71
arch/m68k/amiga/config.c +0 -3
@@ -431,9 +431,6 @@ void __init config_amiga(void) mach_floppy_setup = amiga_floppy_setup;#endif mach_reset = amiga_reset; -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif #if defined(CONFIG_INPUT_M68K_BEEP ) || defined(CONFIG_INPUT_M68K_BEEP_MODULE ) mach_beep = amiga_mksound;#endif
arch/m68k/apollo/config.c +0 -3
@@ -176,9 +176,6 @@ void config_apollo(void) { mach_set_clock_mmss = dn_dummy_set_clock_mmss;/* */ mach_process_int = dn_process_int; mach_reset = dn_dummy_reset;/* */ -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif #ifdef CONFIG_HEARTBEAT mach_heartbeat = dn_heartbeat;#endif
arch/m68k/atari/config.c +0 -3
@@ -247,9 +247,6 @@ void __init config_atari(void)#ifdef CONFIG_ATARI_FLOPPY mach_floppy_setup = atari_floppy_setup;#endif -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif mach_max_dma_address =0xffffff ;#if defined(CONFIG_INPUT_M68K_BEEP ) || defined(CONFIG_INPUT_M68K_BEEP_MODULE ) mach_beep = atari_mksound;
arch/m68k/hp300/config.c +0 -3
@@ -261,9 +261,6 @@ void __init config_hp300(void)#ifdef CONFIG_HEARTBEAT mach_heartbeat = hp300_pulse;#endif -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif mach_max_dma_address =0xffffffff ;if (hp300_model >=HP_330 && hp300_model <=HP_433S && hp300_model !=HP_350 ) {
arch/m68k/kernel/setup.c +4 -0
@@ -282,6 +282,10 @@ void __init setup_arch(char **cmdline_p) } } +#ifdef CONFIG_DUMMY_CONSOLE + conswitchp = &dummy_con; +#endif +switch (m68k_machtype) {#ifdef CONFIG_AMIGA case MACH_AMIGA :
arch/m68k/mac/config.c +0 -3
@@ -212,9 +212,6 @@ void __init config_mac(void) mach_reset = mac_reset; mach_halt = mac_poweroff; mach_power_off = mac_poweroff; -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif mach_max_dma_address =0xffffffff ;#if 0 mach_debug_init = mac_debug_init;
arch/m68k/q40/config.c +0 -3
@@ -194,9 +194,6 @@ void __init config_q40(void) mach_heartbeat = q40_heartbeat;#endif mach_halt = q40_halt; -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif /* disable a few things that SMSQ might have left enabled */ q40_disable_irqs ();
arch/m68k/sun3/config.c +0 -3
@@ -160,9 +160,6 @@ void __init config_sun3(void) mach_hwclk = sun3_hwclk; mach_halt = sun3_halt; mach_get_hardware_list = sun3_get_hardware_list; -#if defined(CONFIG_DUMMY_CONSOLE ) - conswitchp = &dummy_con; -#endif memory_start = ((((int )&_end) +0x2000 ) & ~0x1fff );// PROM seems to want the last couple of physical pages. --m
arch/m68k/sun3x/config.c +0 -4
@@ -71,10 +71,6 @@ void __init config_sun3x(void) mach_get_model = sun3_get_model; mach_get_hardware_list = sun3x_get_hardware_list; -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif - sun3_intreg = (unsigned char *)SUN3X_INTREG ;/* only the serial console is known to work anyway... */
Signature · 1 line
0.99.9.GIT