Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2003-06-14 07:46:27 +1000
committerAnton Blanchard <anton@samba.org>2003-06-14 07:46:27 +1000
commit991eb637a04d34b4acdc4599eb0d245a1fd70d5d (patch)
treef404555e9d13c7e45260b4658a354946aff62a91
parentf70340300df2bde9b5f6f65da39988bebb49ec2b (diff)
parentb6cc6409be56040332324cfefef64b50c192f950 (diff)
Merge bk://ppc.bkbits.net/for-linus-ppc64
into samba.org:/home/anton/ppc64/for-linus-ppc64
-rw-r--r--arch/ppc64/boot/zlib.c27
-rw-r--r--arch/ppc64/lib/copyuser.S2
2 files changed, 16 insertions, 13 deletions
diff --git a/arch/ppc64/boot/zlib.c b/arch/ppc64/boot/zlib.c
index 14f9e81b6474..4616aadfa430 100644
--- a/arch/ppc64/boot/zlib.c
+++ b/arch/ppc64/boot/zlib.c
@@ -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;
diff --git a/arch/ppc64/lib/copyuser.S b/arch/ppc64/lib/copyuser.S
index a359bae9c051..a0b3fbbd6fb1 100644
--- a/arch/ppc64/lib/copyuser.S
+++ b/arch/ppc64/lib/copyuser.S
@@ -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