Messages in this thread Patch in this message | | | Date | Wed, 9 Mar 2011 14:17:18 -0800 | From | Michel Lespinasse <> | Subject | Re: [PATCH] futex: cmpxchg_futex_value_locked API change |
| |
On Wed, Mar 09, 2011 at 04:08:39PM +0100, Martin Schwidefsky wrote: > On Wed, 9 Mar 2011 03:25:50 -0800 > Michel Lespinasse <walken@google.com> wrote: > > All right. Attaching updated version of the diff. I also fixed the s390 > > issue reported by Martin Schwidefsky. > > The inline assmeblies look good now but I get this compile error on s390: > > CC arch/s390/lib/uaccess_pt.o > arch/s390/lib/uaccess_pt.c:373: error: conflicting types for 'futex_atomic_cmpxchg_pt' > arch/s390/lib/uaccess.h:21: note: previous declaration of 'futex_atomic_cmpxchg_pt' was here > arch/s390/lib/uaccess_pt.c:403: warning: initialization from incompatible pointer type > make[1]: *** [arch/s390/lib/uaccess_pt.o] Error 1
My bad. Somehow I made the change in arch/s390/lib/uaccess_std.c but missed it in arch/s390/lib/uaccess_pt.c ... Attached patch below goes on top of the previous changes - Thomas, if you have picked the previous patch, please squash this one on top of it :)
Signed-off-by: Michel Lespinasse <walken@google.com>
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c index afc716a..7483383 100644 --- a/arch/s390/lib/uaccess_pt.c +++ b/arch/s390/lib/uaccess_pt.c @@ -370,8 +370,8 @@ static int __futex_atomic_cmpxchg_pt(u32 *uval, u32 __user *uaddr, return ret; } -int futex_atomic_cmpxchg_pt(int *uval, int __user *uaddr, - int oldval, int newval) +int futex_atomic_cmpxchg_pt(u32 *uval, u32 __user *uaddr, + u32 oldval, u32 newval) { int ret; -- Michel "Walken" Lespinasse A program is never fully debugged until the last user dies.
| |