patch-2.1.90 linux/init/main.c

• Lines: 50
• Date: Thu Mar 12 10:56:01 1998
• Orig file: v2.1.89/linux/init/main.c
• Orig date: Thu Feb 12 20:56:13 1998

diff -u --recursive --new-file v2.1.89/linux/init/main.c linux/init/main.c
@@ -78,8 +78,6 @@
 extern void smp_setup(char *str, int *ints);
 extern void ioapic_pirq_setup(char *str, int *ints);
 extern void no_scroll(char *str, int *ints);
-extern void swap_setup(char *str, int *ints);
-extern void buff_setup(char *str, int *ints);
 extern void panic_setup(char *str, int *ints);
 extern void bmouse_setup(char *str, int *ints);
 extern void msmouse_setup(char *str, int *ints);
@@ -278,7 +276,7 @@
 extern void ftape_setup(char *str, int *ints);
 #endif
 
-#if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD)
+#if defined(CONFIG_SYSVIPC)
 extern void ipc_init(void);
 #endif
 
@@ -490,8 +488,6 @@
 #if defined (CONFIG_AMIGA) || defined (CONFIG_ATARI)
 	{ "video=", video_setup },
 #endif
-	{ "swap=", swap_setup },
-	{ "buff=", buff_setup },
 	{ "panic=", panic_setup },
 	{ "console=", console_setup },
 #ifdef CONFIG_VT
@@ -1061,7 +1057,7 @@
 	inode_init();
 	file_table_init();
 	sock_init();
-#if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD)
+#if defined(CONFIG_SYSVIPC)
 	ipc_init();
 #endif
 	dquot_init();
@@ -1180,6 +1176,13 @@
 				printk(KERN_ERR "Change root to /initrd: "
 				    "error %d\n",error);
 		}
+	}
+#endif
+
+#ifdef CONFIG_KMOD
+	{
+		extern int kmod_init(void);
+		kmod_init();
 	}
 #endif