diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-07-04 04:43:37 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-07-04 04:43:41 +0300 |
| commit | 2caf12c9ed84a39b383d0f237d1506b7e9a95bdf (patch) | |
| tree | 8ba503d4cb7079f73d4b71f306c3e0c120cec53b /arch/arm64/include/asm/futex.h | |
| parent | d83aec28b086ee676056638d77ac93b06ec3d4b1 (diff) | |
| parent | 8584aaf1c3262ca17d1e4a614ede9179ef462bb0 (diff) | |
| download | linux-dev-5.1.tar.xz | |
Merge tag 'v5.1.16' into dev-5.1dev-5.1
This is the 5.1.16 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/arm64/include/asm/futex.h')
| -rw-r--r-- | arch/arm64/include/asm/futex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h index 2d78ea6932b7..bdb3c05070a2 100644 --- a/arch/arm64/include/asm/futex.h +++ b/arch/arm64/include/asm/futex.h @@ -134,7 +134,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr, : "memory"); uaccess_disable(); - *uval = val; + if (!ret) + *uval = val; + return ret; } |