Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
include
/
asm-generic
/
futex.h
diff --git
a/kernel/include/asm-generic/futex.h
b/kernel/include/asm-generic/futex.h
index
e56272c
..
bf2d34c
100644
(file)
--- a/
kernel/include/asm-generic/futex.h
+++ b/
kernel/include/asm-generic/futex.h
@@
-108,11
+108,15
@@
futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
u32 val;
preempt_disable();
u32 val;
preempt_disable();
- if (unlikely(get_user(val, uaddr) != 0))
+ if (unlikely(get_user(val, uaddr) != 0)) {
+ preempt_enable();
return -EFAULT;
return -EFAULT;
+ }
- if (val == oldval && unlikely(put_user(newval, uaddr) != 0))
+ if (val == oldval && unlikely(put_user(newval, uaddr) != 0)) {
+ preempt_enable();
return -EFAULT;
return -EFAULT;
+ }
*uval = val;
preempt_enable();
*uval = val;
preempt_enable();