From: Martin Schwidefsky <[email protected]> [patch] s390: futex atomic operations part 2. Add missing primitive futex_atomic_cmpxchg_inatomic. Remove incorrect type cast of uaddr memory constraint from __futex_atomic_op. Signed-off-by: Martin Schwidefsky <[email protected]> --- include/asm-s390/futex.h | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff -urpN linux-2.6/include/asm-s390/futex.h linux-2.6-patched/include/asm-s390/futex.h --- linux-2.6/include/asm-s390/futex.h 2006-04-25 13:41:36.000000000 +0200 +++ linux-2.6-patched/include/asm-s390/futex.h 2006-04-25 15:24:01.000000000 +0200 @@ -30,9 +30,9 @@ "2:\n" \ __futex_atomic_fixup \ : "=d" (ret), "=&d" (oldval), "=&d" (newval), \ - "=m" (*(unsigned long __user *) uaddr) \ + "=m" (*uaddr) \ : "0" (-EFAULT), "d" (oparg), "a" (uaddr), \ - "m" (*(unsigned long __user *) uaddr) : "cc" ); + "m" (*uaddr) : "cc" ); static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr) { @@ -90,5 +90,32 @@ static inline int futex_atomic_op_inuser return ret; } +static inline int +futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) +{ + int ret; + + if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int))) + return -EFAULT; + asm volatile(" cs %1,%4,0(%5)\n" + "0: lr %0,%1\n" + "1:\n" +#ifndef __s390x__ + ".section __ex_table,\"a\"\n" + " .align 4\n" + " .long 0b,1b\n" + ".previous" +#else /* __s390x__ */ + ".section __ex_table,\"a\"\n" + " .align 8\n" + " .quad 0b,1b\n" + ".previous" +#endif /* __s390x__ */ + : "=d" (ret), "+d" (oldval), "=m" (*uaddr) + : "0" (-EFAULT), "d" (newval), "a" (uaddr), "m" (*uaddr) + : "cc", "memory" ); + return oldval; +} + #endif /* __KERNEL__ */ #endif /* _ASM_S390_FUTEX_H */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Prev by Date: Re: [Patch 0/8] per-task delay accounting
- Next by Date: [patch] s390: new system calls.
- Previous by thread: Issues with removable media
- Next by thread: [patch] s390: new system calls.
- Index(es):
 |