The patch titled init/: delete hard-coded setting and testing of BUILD_CRAMDISK has been added to the -mm tree. Its filename is init-delete-hard-coded-setting-and-testing-of-build_cramdisk.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: init/: delete hard-coded setting and testing of BUILD_CRAMDISK From: "Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- init/do_mounts_rd.c | 12 ------------ 1 file changed, 12 deletions(-) diff -puN init/do_mounts_rd.c~init-delete-hard-coded-setting-and-testing-of-build_cramdisk init/do_mounts_rd.c --- a/init/do_mounts_rd.c~init-delete-hard-coded-setting-and-testing-of-build_cramdisk +++ a/init/do_mounts_rd.c @@ -10,8 +10,6 @@ #include "do_mounts.h" -#define BUILD_CRAMDISK - int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */ static int __init prompt_ramdisk(char *str) @@ -162,14 +160,8 @@ int __init rd_load_image(char *from) goto done; if (nblocks == 0) { -#ifdef BUILD_CRAMDISK if (crd_load(in_fd, out_fd) == 0) goto successful_load; -#else - printk(KERN_NOTICE - "RAMDISK: Kernel does not support compressed " - "RAM disk images\n"); -#endif goto done; } @@ -267,8 +259,6 @@ int __init rd_load_disk(int n) return rd_load_image("/dev/root"); } -#ifdef BUILD_CRAMDISK - /* * gzip declarations */ @@ -425,5 +415,3 @@ static int __init crd_load(int in_fd, in kfree(window); return result; } - -#endif /* BUILD_CRAMDISK */ _ Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are linux-next.patch xtensa-warn-about-including-asm-rwsemh-directly.patch xtensa-use-newer-__spin_lock_unlocked-macro.patch remove-apparently-unused-fd1772h-header-file.patch init-delete-hard-coded-setting-and-testing-of-build_cramdisk.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html