patch-2.4.0-test7 linux/init/main.c

• Lines: 29
• Date: Sun Aug 13 19:25:14 2000
• Orig file: v2.4.0-test6/linux/init/main.c
• Orig date: Wed Aug 9 19:19:51 2000

diff -u --recursive --new-file v2.4.0-test6/linux/init/main.c linux/init/main.c
@@ -95,7 +95,6 @@
 extern void signals_init(void);
 extern void bdev_init(void);
 extern int init_pcmcia_ds(void);
-extern int usb_init(void);
 
 extern void free_initmem(void);
 extern void filesystem_setup(void);
@@ -562,8 +561,8 @@
 	mempages = num_physpages;
 
 	fork_init(mempages);
+	proc_caches_init();
 	vfs_caches_init(mempages);
-	vma_init();
 	buffer_init(mempages);
 	page_cache_init(mempages);
 	kiobuf_setup();
@@ -685,10 +684,6 @@
 #endif
 #ifdef CONFIG_ISAPNP
 	isapnp_init();
-#endif
-#ifdef CONFIG_USB
-	usb_init();	/* Do this before doing initcalls, so that we can make
-			usbcore initialize here, and all drivers initialize later */
 #endif
 #ifdef CONFIG_TC
 	tc_init();