patch-2.1.109 linux/arch/sparc/kernel/setup.c

• Lines: 30
• Date: Fri Jul 10 15:18:30 1998
• Orig file: v2.1.108/linux/arch/sparc/kernel/setup.c
• Orig date: Thu Apr 23 20:21:30 1998

diff -u --recursive --new-file v2.1.108/linux/arch/sparc/kernel/setup.c linux/arch/sparc/kernel/setup.c
@@ -120,7 +120,6 @@
 #define BOOTME_KGDB   0xc
 
 #ifdef CONFIG_SUN_CONSOLE
-extern char *console_fb_path;
 static int console_fb = 0;
 #endif
 static unsigned long memory_size __initdata = 0;
@@ -220,7 +219,6 @@
 					prom_printf ("Using /dev/ttyb as console.\n");
 				} else {
 					console_fb = 1;
-					console_fb_path = commands;
 				}
 			} else
 #endif
@@ -466,6 +464,13 @@
 	init_task.mm->context = (unsigned long) NO_CONTEXT;
 	init_task.tss.kregs = &fake_swapper_regs;
 
+	if (!serial_console) {
+#ifdef CONFIG_PROM_CONSOLE
+		conswitchp = &prom_con;
+#elif defined(CONFIG_DUMMY_CONSOLE)
+		conswitchp = &dummy_con;
+#endif
+	}
 }
 
 asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int on)