From: Al Viro Signed-off-by: Kars de Jong Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton --- 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(-) diff -puN arch/m68k/amiga/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/amiga/config.c --- devel/arch/m68k/amiga/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/amiga/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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 diff -puN arch/m68k/apollo/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/apollo/config.c --- devel/arch/m68k/apollo/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/apollo/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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 diff -puN arch/m68k/atari/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/atari/config.c --- devel/arch/m68k/atari/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/atari/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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; diff -puN arch/m68k/hp300/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/hp300/config.c --- devel/arch/m68k/hp300/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/hp300/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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) { diff -puN arch/m68k/kernel/setup.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/kernel/setup.c --- devel/arch/m68k/kernel/setup.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/kernel/setup.c 2006-01-04 22:24:51.000000000 -0800 @@ -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: diff -puN arch/m68k/mac/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/mac/config.c --- devel/arch/m68k/mac/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/mac/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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; diff -puN arch/m68k/q40/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/q40/config.c --- devel/arch/m68k/q40/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/q40/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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(); diff -puN arch/m68k/sun3/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/sun3/config.c --- devel/arch/m68k/sun3/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/sun3/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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 diff -puN arch/m68k/sun3x/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup arch/m68k/sun3x/config.c --- devel/arch/m68k/sun3x/config.c~m68k-moved-initialisation-of-conswitchp-from-subarches-to-global-arch-setup 2006-01-04 22:24:51.000000000 -0800 +++ devel-akpm/arch/m68k/sun3x/config.c 2006-01-04 22:24:51.000000000 -0800 @@ -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... */ _