patch-2.3.43 linux/init/main.c

• Lines: 45
• Date: Wed Feb 9 20:08:09 2000
• Orig file: v2.3.42/linux/init/main.c
• Orig date: Fri Jan 21 18:19:17 2000

diff -u --recursive --new-file v2.3.42/linux/init/main.c linux/init/main.c
@@ -20,6 +20,7 @@
 #include <linux/utsname.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/raid/md.h>
 #include <linux/smp_lock.h>
 #include <linux/blk.h>
 #include <linux/hdreg.h>
@@ -45,10 +46,6 @@
 #  include <asm/mtrr.h>
 #endif
 
-#ifdef CONFIG_APM
-#include <linux/apm_bios.h>
-#endif
-
 #ifdef CONFIG_MAC
 extern void nubus_init(void);
 #endif
@@ -114,6 +111,7 @@
 #define MAX_INIT_ENVS 8
 
 extern void time_init(void);
+extern void softirq_init(void);
 
 int rows, cols;
 
@@ -472,6 +470,7 @@
 	init_IRQ();
 	sched_init();
 	time_init();
+	softirq_init();
 	parse_options(command_line);
 
 	/*
@@ -685,6 +684,9 @@
 			while (pid != wait(&i));
 		if (MAJOR(real_root_dev) != RAMDISK_MAJOR
 		     || MINOR(real_root_dev) != 0) {
+#ifdef CONFIG_BLK_DEV_MD
+			autodetect_raid();
+#endif
 			error = change_root(real_root_dev,"/initrd");
 			if (error)
 				printk(KERN_ERR "Change root to /initrd: "