Commit 9e1a760d authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] 2.5.6-pre2 II: rd cleanup

From: Dave Jones <davej@suse.de>
  kernel builds and boots with patch (with CONFIG_BLK_DEV_INITRD disabled).

(Trivial because CONFIG_BLK_DEV_RAM is Y if CONFIG_BLK_DEV_INITRD is Y)
parent a3806a80
...@@ -11,18 +11,24 @@ ...@@ -11,18 +11,24 @@
extern void set_device_ro(kdev_t dev,int flag); extern void set_device_ro(kdev_t dev,int flag);
extern void add_blkdev_randomness(int major); extern void add_blkdev_randomness(int major);
#ifdef CONFIG_BLK_DEV_RAM
extern int rd_doload; /* 1 = load ramdisk, 0 = don't load */
extern int rd_prompt; /* 1 = prompt for ramdisk, 0 = don't prompt */
extern int rd_image_start; /* starting block # of image */
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
#define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */ #define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */
extern unsigned long initrd_start,initrd_end; extern unsigned long initrd_start,initrd_end;
extern int initrd_below_start_ok; /* 1 if it is not an error if initrd_start < memory_start */ extern int initrd_below_start_ok; /* 1 if it is not an error if initrd_start < memory_start */
extern int rd_doload; /* 1 = load ramdisk, 0 = don't load */
extern int rd_prompt; /* 1 = prompt for ramdisk, 0 = don't prompt */
extern int rd_image_start; /* starting block # of image */
void initrd_init(void); void initrd_init(void);
#endif /* CONFIG_BLK_DEV_INITRD */
#endif #endif
/* /*
* end_request() and friends. Must be called with the request queue spinlock * end_request() and friends. Must be called with the request queue spinlock
* acquired. All functions called within end_request() _must_be_ atomic. * acquired. All functions called within end_request() _must_be_ atomic.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment