]> err.no Git - linux-2.6/commitdiff
[PATCH] compat_sys_futex() warning fix
authorAndrew Morton <akpm@osdl.org>
Tue, 28 Mar 2006 09:56:55 +0000 (01:56 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 28 Mar 2006 17:16:09 +0000 (09:16 -0800)
kernel/futex_compat.c: In function `compat_sys_futex':
kernel/futex_compat.c:140: warning: passing arg 1 of `do_futex' makes integer from pointer without a cast
kernel/futex_compat.c:140: warning: passing arg 5 of `do_futex' makes integer from pointer without a cast

Not sure what Ingo was thinking of here.  Put the casts back in.

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/futex_compat.c

index 9c077cf9aa84b81c0da8d87450b6fb491b3a231f..54274fc853216d7448762c78e37ac0cd30d5e8f6 100644 (file)
@@ -137,5 +137,6 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,
        if (op >= FUTEX_REQUEUE)
                val2 = (int) (unsigned long) utime;
 
-       return do_futex(uaddr, op, val, timeout, uaddr2, val2, val3);
+       return do_futex((unsigned long)uaddr, op, val, timeout,
+                       (unsigned long)uaddr2, val2, val3);
 }