init/: delete hard-coded setting and testing of BUILD_CRAMDISK
There seems to be little point in explicitly setting, then testing the macro BUILD_CRAMDISK within the context of a single source file. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b39c08cb69
commit
cb345d7352
|
@ -10,8 +10,6 @@
|
||||||
|
|
||||||
#include "do_mounts.h"
|
#include "do_mounts.h"
|
||||||
|
|
||||||
#define BUILD_CRAMDISK
|
|
||||||
|
|
||||||
int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
|
int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
|
||||||
|
|
||||||
static int __init prompt_ramdisk(char *str)
|
static int __init prompt_ramdisk(char *str)
|
||||||
|
@ -162,14 +160,8 @@ int __init rd_load_image(char *from)
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
if (nblocks == 0) {
|
if (nblocks == 0) {
|
||||||
#ifdef BUILD_CRAMDISK
|
|
||||||
if (crd_load(in_fd, out_fd) == 0)
|
if (crd_load(in_fd, out_fd) == 0)
|
||||||
goto successful_load;
|
goto successful_load;
|
||||||
#else
|
|
||||||
printk(KERN_NOTICE
|
|
||||||
"RAMDISK: Kernel does not support compressed "
|
|
||||||
"RAM disk images\n");
|
|
||||||
#endif
|
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -267,8 +259,6 @@ int __init rd_load_disk(int n)
|
||||||
return rd_load_image("/dev/root");
|
return rd_load_image("/dev/root");
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BUILD_CRAMDISK
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* gzip declarations
|
* gzip declarations
|
||||||
*/
|
*/
|
||||||
|
@ -425,5 +415,3 @@ static int __init crd_load(int in_fd, int out_fd)
|
||||||
kfree(window);
|
kfree(window);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* BUILD_CRAMDISK */
|
|
||||||
|
|
Loading…
Reference in a new issue