patch-1.3.73 linux/drivers/block/genhd.c
Next file: linux/drivers/block/ide-cd.c
Previous file: linux/drivers/block/floppy.c
Back to the patch index
Back to the overall index
- Lines: 29
- Date:
Sat Mar 9 13:31:43 1996
- Orig file:
v1.3.72/linux/drivers/block/genhd.c
- Orig date:
Sat Mar 2 10:43:22 1996
diff -u --recursive --new-file v1.3.72/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -24,6 +24,9 @@
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/string.h>
+#ifdef CONFIG_BLK_DEV_INITRD
+#include <linux/blk.h>
+#endif
#include <asm/system.h>
@@ -48,6 +51,7 @@
static int current_minor = 0;
extern int *blk_size[];
extern void rd_load(void);
+extern void initrd_load(void);
extern int chr_dev_init(void);
extern int blk_dev_init(void);
@@ -601,6 +605,10 @@
nr += p->nr_real;
}
#ifdef CONFIG_BLK_DEV_RAM
+#ifdef CONFIG_BLK_DEV_INITRD
+ if (initrd_start && mount_initrd) initrd_load();
+ else
+#endif
rd_load();
#endif
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this