From: Milton Miller <miltonm@bga.com>
Date: Fri, 21 Sep 2007 23:03:34 +0000 (+1000)
Subject: [POWERPC] boot: Record header bytes in gunzip_start
X-Git-Tag: v2.6.24-rc1~1450^2~159
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=e47654d016c68a02f654ac16951577804f7789c7;p=safe%2Fjmp%2Flinux-2.6

[POWERPC] boot: Record header bytes in gunzip_start

Record the number of header bytes skipped in the total bytes read field.

This is needed for the initramfs parsing code to find the end of the zip file.

Signed-off-by: Milton Miller <miltonm@bga.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/boot/gunzip_util.c b/arch/powerpc/boot/gunzip_util.c
index df8ab07..e1e215e 100644
--- a/arch/powerpc/boot/gunzip_util.c
+++ b/arch/powerpc/boot/gunzip_util.c
@@ -78,6 +78,7 @@ void gunzip_start(struct gunzip_state *state, void *src, int srclen)
 			fatal("inflateInit2 returned %d\n\r", r);
 	}
 
+	state->s.total_in = hdrlen;
 	state->s.next_in = src + hdrlen;
 	state->s.avail_in = srclen - hdrlen;
 }