tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] m68k: Moved initialisation of conswitchp from subarches to global arch setup

Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds 0c79358b 35efbcab

+4 -25
unified split
-3
arch/m68k/amiga/config.c
··· 431 431 mach_floppy_setup = amiga_floppy_setup; 432 432 #endif 433 433 mach_reset = amiga_reset; 434 - #ifdef CONFIG_DUMMY_CONSOLE 435 - conswitchp = &dummy_con; 436 - #endif 437 434 #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) 438 435 mach_beep = amiga_mksound; 439 436 #endif
-3
arch/m68k/apollo/config.c
··· 176 176 mach_set_clock_mmss = dn_dummy_set_clock_mmss; /* */ 177 177 mach_process_int = dn_process_int; 178 178 mach_reset = dn_dummy_reset; /* */ 179 - #ifdef CONFIG_DUMMY_CONSOLE 180 - conswitchp = &dummy_con; 181 - #endif 182 179 #ifdef CONFIG_HEARTBEAT 183 180 mach_heartbeat = dn_heartbeat; 184 181 #endif
-3
arch/m68k/atari/config.c
··· 247 247 #ifdef CONFIG_ATARI_FLOPPY 248 248 mach_floppy_setup = atari_floppy_setup; 249 249 #endif 250 - #ifdef CONFIG_DUMMY_CONSOLE 251 - conswitchp = &dummy_con; 252 - #endif 253 250 mach_max_dma_address = 0xffffff; 254 251 #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) 255 252 mach_beep = atari_mksound;
-3
arch/m68k/hp300/config.c
··· 261 261 #ifdef CONFIG_HEARTBEAT 262 262 mach_heartbeat = hp300_pulse; 263 263 #endif 264 - #ifdef CONFIG_DUMMY_CONSOLE 265 - conswitchp = &dummy_con; 266 - #endif 267 264 mach_max_dma_address = 0xffffffff; 268 265 269 266 if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) {
+4
arch/m68k/kernel/setup.c
··· 282 282 } 283 283 } 284 284 285 + #ifdef CONFIG_DUMMY_CONSOLE 286 + conswitchp = &dummy_con; 287 + #endif 288 + 285 289 switch (m68k_machtype) { 286 290 #ifdef CONFIG_AMIGA 287 291 case MACH_AMIGA:
-3
arch/m68k/mac/config.c
··· 212 212 mach_reset = mac_reset; 213 213 mach_halt = mac_poweroff; 214 214 mach_power_off = mac_poweroff; 215 - #ifdef CONFIG_DUMMY_CONSOLE 216 - conswitchp = &dummy_con; 217 - #endif 218 215 mach_max_dma_address = 0xffffffff; 219 216 #if 0 220 217 mach_debug_init = mac_debug_init;
-3
arch/m68k/q40/config.c
··· 194 194 mach_heartbeat = q40_heartbeat; 195 195 #endif 196 196 mach_halt = q40_halt; 197 - #ifdef CONFIG_DUMMY_CONSOLE 198 - conswitchp = &dummy_con; 199 - #endif 200 197 201 198 /* disable a few things that SMSQ might have left enabled */ 202 199 q40_disable_irqs();
-3
arch/m68k/sun3/config.c
··· 160 160 mach_hwclk = sun3_hwclk; 161 161 mach_halt = sun3_halt; 162 162 mach_get_hardware_list = sun3_get_hardware_list; 163 - #if defined(CONFIG_DUMMY_CONSOLE) 164 - conswitchp = &dummy_con; 165 - #endif 166 163 167 164 memory_start = ((((int)&_end) + 0x2000) & ~0x1fff); 168 165 // PROM seems to want the last couple of physical pages. --m
-4
arch/m68k/sun3x/config.c
··· 71 71 mach_get_model = sun3_get_model; 72 72 mach_get_hardware_list = sun3x_get_hardware_list; 73 73 74 - #ifdef CONFIG_DUMMY_CONSOLE 75 - conswitchp = &dummy_con; 76 - #endif 77 - 78 74 sun3_intreg = (unsigned char *)SUN3X_INTREG; 79 75 80 76 /* only the serial console is known to work anyway... */