Commit 991eb637 authored by Anton Blanchard's avatar Anton Blanchard

Merge bk://ppc.bkbits.net/for-linus-ppc64

into samba.org:/home/anton/ppc64/for-linus-ppc64
parents f7034030 b6cc6409
......@@ -1545,10 +1545,11 @@ local inflate_huft *fixed_tl;
local inflate_huft *fixed_td;
local voidpf falloc(q, n, s)
voidpf q; /* opaque pointer (not used) */
uInt n; /* number of items */
uInt s; /* size of item */
local voidpf falloc(
voidpf q, /* opaque pointer (not used) */
uInt n, /* number of items */
uInt s /* size of item */
)
{
Assert(s == sizeof(inflate_huft) && n <= fixed_left,
"inflate_trees falloc overflow");
......@@ -1558,10 +1559,11 @@ uInt s; /* size of item */
}
local void ffree(q, p, n)
voidpf q;
voidpf p;
uInt n;
local void ffree(
voidpf q,
voidpf p,
uInt n
)
{
Assert(0, "inflate_trees ffree called!");
if (q) q = p; /* to make some compilers happy */
......@@ -2164,10 +2166,11 @@ char *z_errmsg[] = {
#define DO16(buf) DO8(buf); DO8(buf);
/* ========================================================================= */
uLong adler32(adler, buf, len)
uLong adler;
Bytef *buf;
uInt len;
uLong adler32(
uLong adler,
Bytef *buf,
uInt len
)
{
unsigned long s1 = adler & 0xffff;
unsigned long s2 = (adler >> 16) & 0xffff;
......
......@@ -130,7 +130,7 @@ _GLOBAL(__copy_tofrom_user)
6: cmpwi cr1,r5,8
addi r3,r3,32
sld r9,r9,r10
blt cr1,.Ldo_tail
ble cr1,.Ldo_tail
34: ld r0,8(r4)
srd r7,r0,r11
or r9,r7,r9
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment