Access to 'op' variable does not require pagefault_disable(), 'ret' variable should be initialized before using, 'oldval' variable can be replaced by constant. Signed-off-by: Vasily Averin <vvs@xxxxxxxxxxxxx> --- include/asm-generic/futex.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h index 8666fe7f35d7..e9a9655d786d 100644 --- a/include/asm-generic/futex.h +++ b/include/asm-generic/futex.h @@ -118,9 +118,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) { - int oldval = 0, ret; - - pagefault_disable(); + int ret = 0; switch (op) { case FUTEX_OP_SET: @@ -132,10 +130,8 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS; } - pagefault_enable(); - if (!ret) - *oval = oldval; + *oval = 0; return ret; } -- 2.17.1