patch-2.1.110 linux/init/main.c
Next file: linux/kernel/ksyms.c
Previous file: linux/include/net/sock.h
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Mon Jul 20 14:21:43 1998
- Orig file:
v2.1.109/linux/init/main.c
- Orig date:
Wed Jun 24 22:54:12 1998
diff -u --recursive --new-file v2.1.109/linux/init/main.c linux/init/main.c
@@ -88,7 +88,9 @@
#ifdef __i386__
extern void ioapic_pirq_setup(char *str, int *ints);
#endif
+#ifdef CONFIG_VGA_CONSOLE
extern void no_scroll(char *str, int *ints);
+#endif
extern void kbd_reset_setup(char *str, int *ints);
extern void panic_setup(char *str, int *ints);
extern void bmouse_setup(char *str, int *ints);
@@ -536,7 +538,9 @@
{ "panic=", panic_setup },
{ "console=", console_setup },
#ifdef CONFIG_VT
+#ifdef CONFIG_VGA_CONSOLE
{ "no-scroll", no_scroll },
+#endif
{ "kbd-reset", kbd_reset_setup },
#endif
#ifdef CONFIG_BUGi386
@@ -1105,12 +1109,12 @@
#if defined(CONFIG_QUOTA)
dquot_init_hash();
#endif
- check_bugs();
-
- printk("POSIX conformance testing by UNIFIX\n");
#ifdef __SMP__
smp_init();
#endif
+ printk("POSIX conformance testing by UNIFIX\n");
+ check_bugs();
+
sock_init();
#ifdef CONFIG_SYSCTL
sysctl_init();
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov