From: Andrew Morton Date: Tue, 28 Mar 2006 09:56:55 +0000 (-0800) Subject: [PATCH] compat_sys_futex() warning fix X-Git-Tag: v2.6.17-rc1~210 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ec7e15d6486e9d1da1c2f344b670b8388ba7019b;p=linux-2.6-omap-h63xx.git [PATCH] compat_sys_futex() warning fix 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index 9c077cf9aa8..54274fc8532 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c @@ -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); }