summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c
index 3afae2ad4..c7eabdcc8 100644
--- a/init/main.c
+++ b/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
@@ -123,6 +120,7 @@ extern void dquot_init_hash(void);
#define MAX_INIT_ENVS 8
extern void time_init(void);
+extern void softirq_init(void);
int rows, cols;
@@ -481,6 +479,7 @@ asmlinkage void __init start_kernel(void)
init_IRQ();
sched_init();
time_init();
+ softirq_init();
parse_options(command_line);
/*
@@ -700,6 +699,9 @@ static void __init do_basic_setup(void)
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: "