summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-11 14:37:22 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-13 15:13:45 +1000
commitce8f150a174c105abddbd3cc193cbba57f9db255 (patch)
tree426705827fccf91e39c864da9cec515c9277d729 /arch/powerpc
parentb09c2ec4082c63584491f35df2cb530ee8ca312d (diff)
downloadop-kernel-dev-ce8f150a174c105abddbd3cc193cbba57f9db255.zip
op-kernel-dev-ce8f150a174c105abddbd3cc193cbba57f9db255.tar.gz
powerpc/boot: Use correct zlib types for comparison
Avoids this warning: arch/powerpc/boot/gunzip_util.c:118:9: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/gunzip_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/gunzip_util.c b/arch/powerpc/boot/gunzip_util.c
index ef2aed0..9dc5250 100644
--- a/arch/powerpc/boot/gunzip_util.c
+++ b/arch/powerpc/boot/gunzip_util.c
@@ -112,10 +112,10 @@ int gunzip_partial(struct gunzip_state *state, void *dst, int dstlen)
r = zlib_inflate(&state->s, Z_FULL_FLUSH);
if (r != Z_OK && r != Z_STREAM_END)
fatal("inflate returned %d msg: %s\n\r", r, state->s.msg);
- len = state->s.next_out - (unsigned char *)dst;
+ len = state->s.next_out - (Byte *)dst;
} else {
/* uncompressed image */
- len = min(state->s.avail_in, (unsigned)dstlen);
+ len = min(state->s.avail_in, (uLong)dstlen);
memcpy(dst, state->s.next_in, len);
state->s.next_in += len;
state->s.avail_in -= len;
OpenPOWER on IntegriCloud