diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /init | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 10 |
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: " |