SliTaz Repositories

     1.1 --- a/linux/stuff/linux-freeinitrd-2.6.34.u	Fri May 28 21:08:44 2010 +0200
     1.2 +++ b/linux/stuff/linux-freeinitrd-2.6.34.u	Sun Jul 11 11:54:04 2010 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  --- linux-2.6.30.4/arch/x86/mm/init.c
     1.5  +++ linux-2.6.30.4/arch/x86/mm/init.c
     1.6 -@@ -381,7 +381,7 @@
     1.7 +@@ -366,7 +366,7 @@
     1.8   	 */
     1.9   	set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
    1.10   
    1.11 @@ -90,25 +90,21 @@
    1.12   			continue;
    1.13   		}
    1.14   		if (!*buf) {
    1.15 -@@ -446,9 +497,15 @@
    1.16 - 		}
    1.17 +@@ -447,7 +497,12 @@
    1.18   		this_header = 0;
    1.19   		decompress = decompress_method(buf, len, &compress_name);
    1.20 --		if (decompress)
    1.21 --			decompress(buf, len, NULL, flush_buffer, NULL,
    1.22 -+		if (decompress) {
    1.23 + 		if (decompress) {
    1.24 +-			res = decompress(buf, len, NULL, flush_buffer, NULL,
    1.25  +			if (early_free_initrd) {
    1.26 -+				decompress(NULL, 0, fill_buffer, flush_buffer,
    1.27 -+					   NULL, &my_inptr, error);
    1.28 ++				res = decompress(NULL, 0, fill_buffer,
    1.29 ++					   flush_buffer, NULL, &my_inptr, error);
    1.30  +				my_inptr += fill.inptr;
    1.31  +			}
    1.32 -+			else decompress(buf, len, NULL, flush_buffer, NULL,
    1.33 ++			else res = decompress(buf, len, NULL, flush_buffer, NULL,
    1.34   				   &my_inptr, error);
    1.35 -+		}
    1.36 - 		else if (compress_name) {
    1.37 - 			if (!message) {
    1.38 - 				snprintf(msg_buf, sizeof msg_buf,
    1.39 -@@ -485,7 +543,8 @@
    1.40 + 			if (res)
    1.41 + 				error("decompressor failed");
    1.42 +@@ -488,7 +546,8 @@
    1.43   #include <linux/initrd.h>
    1.44   #include <linux/kexec.h>
    1.45   
    1.46 @@ -118,7 +114,7 @@
    1.47   {
    1.48   #ifdef CONFIG_KEXEC
    1.49   	unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
    1.50 -@@ -513,6 +571,12 @@
    1.51 +@@ -516,6 +574,12 @@
    1.52   #endif
    1.53   		free_initrd_mem(initrd_start, initrd_end);
    1.54   skip: