Skip to content

Commit cb345d7

Browse files
rpjdaytorvalds
authored andcommitted
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 <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent b39c08c commit cb345d7

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

init/do_mounts_rd.c

-12
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#include "do_mounts.h"
1212

13-
#define BUILD_CRAMDISK
14-
1513
int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
1614

1715
static int __init prompt_ramdisk(char *str)
@@ -162,14 +160,8 @@ int __init rd_load_image(char *from)
162160
goto done;
163161

164162
if (nblocks == 0) {
165-
#ifdef BUILD_CRAMDISK
166163
if (crd_load(in_fd, out_fd) == 0)
167164
goto successful_load;
168-
#else
169-
printk(KERN_NOTICE
170-
"RAMDISK: Kernel does not support compressed "
171-
"RAM disk images\n");
172-
#endif
173165
goto done;
174166
}
175167

@@ -267,8 +259,6 @@ int __init rd_load_disk(int n)
267259
return rd_load_image("/dev/root");
268260
}
269261

270-
#ifdef BUILD_CRAMDISK
271-
272262
/*
273263
* gzip declarations
274264
*/
@@ -425,5 +415,3 @@ static int __init crd_load(int in_fd, int out_fd)
425415
kfree(window);
426416
return result;
427417
}
428-
429-
#endif /* BUILD_CRAMDISK */

0 commit comments

Comments
 (0)