diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-05 13:25:02 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-05 13:25:02 +0800 |
| commit | 138f2c357e124fa8e676e6f27cc986c3ce320130 (patch) | |
| tree | e0aca2935ad712a92f74025bbccac8583556e79d /include/asm-generic | |
| parent | 2bf7955152a0544342fcaed28930748cc68392ae (diff) | |
| parent | 1a1a512b983108015ced1e7a7c7775cfeec42d8c (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
drivers/base/power/opp/core.c
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/futex.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h index e56272c919b5..bf2d34c9d804 100644 --- a/include/asm-generic/futex.h +++ b/include/asm-generic/futex.h @@ -108,11 +108,15 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 val; preempt_disable(); - if (unlikely(get_user(val, uaddr) != 0)) + if (unlikely(get_user(val, uaddr) != 0)) { + preempt_enable(); return -EFAULT; + } - if (val == oldval && unlikely(put_user(newval, uaddr) != 0)) + if (val == oldval && unlikely(put_user(newval, uaddr) != 0)) { + preempt_enable(); return -EFAULT; + } *uval = val; preempt_enable(); |