diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-02-21 10:57:42 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-02-28 03:37:09 -0500 |
commit | d12a2970385cfe0c1b0439f53c3ed1055d4dee3e (patch) | |
tree | 2e63d3933409588c922af66d76c89eb1b104415d /arch/s390/include/asm/futex.h | |
parent | f45655f6a65538237359abce55edab9cfcc6d82f (diff) |
s390/uaccess: remove pointless access_ok() checks
access_ok() always returns 'true' on s390. Therefore all calls
are quite pointless and can be removed.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/futex.h')
-rw-r--r-- | arch/s390/include/asm/futex.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/include/asm/futex.h b/arch/s390/include/asm/futex.h index 96bc83ea5c90..51bcaa0fdeef 100644 --- a/arch/s390/include/asm/futex.h +++ b/arch/s390/include/asm/futex.h | |||
@@ -16,9 +16,6 @@ static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) | |||
16 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) | 16 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) |
17 | oparg = 1 << oparg; | 17 | oparg = 1 << oparg; |
18 | 18 | ||
19 | if (! access_ok (VERIFY_WRITE, uaddr, sizeof(u32))) | ||
20 | return -EFAULT; | ||
21 | |||
22 | pagefault_disable(); | 19 | pagefault_disable(); |
23 | ret = uaccess.futex_atomic_op(op, uaddr, oparg, &oldval); | 20 | ret = uaccess.futex_atomic_op(op, uaddr, oparg, &oldval); |
24 | pagefault_enable(); | 21 | pagefault_enable(); |
@@ -40,9 +37,6 @@ static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) | |||
40 | static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | 37 | static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, |
41 | u32 oldval, u32 newval) | 38 | u32 oldval, u32 newval) |
42 | { | 39 | { |
43 | if (! access_ok (VERIFY_WRITE, uaddr, sizeof(u32))) | ||
44 | return -EFAULT; | ||
45 | |||
46 | return uaccess.futex_atomic_cmpxchg(uval, uaddr, oldval, newval); | 40 | return uaccess.futex_atomic_cmpxchg(uval, uaddr, oldval, newval); |
47 | } | 41 | } |
48 | 42 | ||