aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-28 01:56:55 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 09:16:09 -0800
commitec7e15d6486e9d1da1c2f344b670b8388ba7019b (patch)
tree479d803ee546b536521dc87095c31781a98a0bb6 /kernel
parent4fa95ef639830ccf0ca1ad42ee9bed87ef642f32 (diff)
downloadkernel_samsung_espresso10-ec7e15d6486e9d1da1c2f344b670b8388ba7019b.zip
kernel_samsung_espresso10-ec7e15d6486e9d1da1c2f344b670b8388ba7019b.tar.gz
kernel_samsung_espresso10-ec7e15d6486e9d1da1c2f344b670b8388ba7019b.tar.bz2
[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 <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex_compat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 9c077cf..54274fc 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);
}