From 40da9741e87a1b39feac964fc2836c5d79d02805 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 28 Mar 2006 01:56:55 -0800 Subject: [PATCH] --- yaml --- r: 24503 b: refs/heads/master c: ec7e15d6486e9d1da1c2f344b670b8388ba7019b h: refs/heads/master i: 24501: c23d19fe81fc4a76d25b52a082311be4bde38c39 24499: 55522970d216e20a0ba7e386e1f98717d72417c8 24495: 5fa412206da638d54c01d97b14387cd94b2b1331 v: v3 --- [refs] | 2 +- trunk/kernel/futex_compat.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a88096aff3f..479f7a7aea13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fa95ef639830ccf0ca1ad42ee9bed87ef642f32 +refs/heads/master: ec7e15d6486e9d1da1c2f344b670b8388ba7019b diff --git a/trunk/kernel/futex_compat.c b/trunk/kernel/futex_compat.c index 9c077cf9aa84..54274fc85321 100644 --- a/trunk/kernel/futex_compat.c +++ b/trunk/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); }