Messages in this thread Patch in this message | | | Date | Sat, 26 Apr 2008 08:36:44 -0400 (EDT) | From | "Robert P. J. Day" <> | Subject | [PATCH] 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>
---
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index ed652f4..54156e9 100644 --- a/init/do_mounts_rd.c +++ b/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, int out_fd) kfree(window); return result; } - -#endif /* BUILD_CRAMDISK */ ======================================================================== Robert P. J. Day Linux Consulting, Training and Annoying Kernel Pedantry: Have classroom, will lecture. http://crashcourse.ca Waterloo, Ontario, CANADA ========================================================================
| |