This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / init / initramfs.c

diff --git a/init/initramfs.c b/init/initramfs.c
index 6e939cc..20bd855 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -372,12 +372,11 @@ static long bytes_out;
 #define Tracecv(c,x)
 
 #define STATIC static
-#define INIT __init
 
-static void __init flush_window(void);
-static void __init error(char *m);
-static void __init gzip_mark(void **);
-static void __init gzip_release(void **);
+static void flush_window(void);
+static void error(char *m);
+static void gzip_mark(void **);
+static void gzip_release(void **);
 
 #include "../lib/inflate.c"
 
@@ -446,7 +445,8 @@ char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
                bytes_out = 0;
                crc = (ulg)0xffffffffL; /* shift register contents */
                makecrc();
-               gunzip();
+               if (gunzip())
+                       message = "ungzip failed";
                if (state != Reset)
                        error("junk in gzipped archive");
                this_header = saved_offset + inptr;