patch-2.4.4 linux/init/main.c

• Lines: 97
• Date: Fri Apr 27 14:23:40 2001
• Orig file: v2.4.3/linux/init/main.c
• Orig date: Mon Mar 19 12:26:25 2001

diff -u --recursive --new-file v2.4.3/linux/init/main.c linux/init/main.c
@@ -27,10 +27,16 @@
 #include <linux/hdreg.h>
 #include <linux/iobuf.h>
 #include <linux/bootmem.h>
+#include <linux/tty.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
 
+#if defined(CONFIG_ARCH_S390)
+#include <asm/s390mach.h>
+#include <asm/ccwcache.h>
+#endif
+
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
 #endif
@@ -47,10 +53,6 @@
 #  include <asm/mtrr.h>
 #endif
 
-#ifdef CONFIG_3215_CONSOLE
-extern int con3215_activate(void);
-#endif
-
 #ifdef CONFIG_NUBUS
 #include <linux/nubus.h>
 #endif
@@ -96,7 +98,6 @@
 extern void net_notifier_init(void);
 
 extern void free_initmem(void);
-extern void filesystem_setup(void);
 
 #ifdef CONFIG_TC
 extern void tc_init(void);
@@ -215,17 +216,7 @@
 	{ "apblock", APBLOCK_MAJOR << 8},
 	{ "ddv", DDV_MAJOR << 8},
 	{ "jsfd",    JSFD_MAJOR << 8},
-#ifdef CONFIG_MDISK
-        { "mnda", (MDISK_MAJOR << MINORBITS)},
-        { "mndb", (MDISK_MAJOR << MINORBITS) + 1},
-        { "mndc", (MDISK_MAJOR << MINORBITS) + 2},
-        { "mndd", (MDISK_MAJOR << MINORBITS) + 3},
-        { "mnde", (MDISK_MAJOR << MINORBITS) + 4},
-        { "mndf", (MDISK_MAJOR << MINORBITS) + 5},
-        { "mndg", (MDISK_MAJOR << MINORBITS) + 6},
-        { "mndh", (MDISK_MAJOR << MINORBITS) + 7},
-#endif
-#ifdef CONFIG_DASD
+#if defined(CONFIG_ARCH_S390)
 	{ "dasda", (DASD_MAJOR << MINORBITS) },
 	{ "dasdb", (DASD_MAJOR << MINORBITS) + (1 << 2) },
 	{ "dasdc", (DASD_MAJOR << MINORBITS) + (2 << 2) },
@@ -570,9 +561,6 @@
 #endif
 	mem_init();
 	kmem_cache_sizes_init();
-#ifdef CONFIG_3215_CONSOLE
-        con3215_activate();
-#endif
 #ifdef CONFIG_PROC_FS
 	proc_root_init();
 #endif
@@ -583,7 +571,9 @@
 	vfs_caches_init(mempages);
 	buffer_init(mempages);
 	page_cache_init(mempages);
-	kiobuf_setup();
+#if defined(CONFIG_ARCH_S390)
+	ccwcache_init();
+#endif
 	signals_init();
 	bdev_init();
 	inode_init(mempages);
@@ -679,6 +669,10 @@
 	 * Ok, at this point all CPU's should be initialized, so
 	 * we can start looking into devices..
 	 */
+#if defined(CONFIG_ARCH_S390)
+	s390_init_machine_check();
+#endif
+
 #ifdef CONFIG_PCI
 	pci_init();
 #endif
@@ -722,9 +716,6 @@
 
 	start_context_thread();
 	do_initcalls();
-
-	/* .. filesystems .. */
-	filesystem_setup();
 
 #ifdef CONFIG_IRDA
 	irda_device_init(); /* Must be done after protocol initialization */