git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-generic
/
futex.h
diff --git
a/include/asm-generic/futex.h
b/include/asm-generic/futex.h
index
3ae2c73
..
f422df0
100644
(file)
--- a/
include/asm-generic/futex.h
+++ b/
include/asm-generic/futex.h
@@
-21,7
+21,7
@@
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
return -EFAULT;
if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
return -EFAULT;
-
inc_preempt_count
();
+
pagefault_disable
();
switch (op) {
case FUTEX_OP_SET:
switch (op) {
case FUTEX_OP_SET:
@@
-33,7
+33,7
@@
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
ret = -ENOSYS;
}
ret = -ENOSYS;
}
-
dec_preempt_count
();
+
pagefault_enable
();
if (!ret) {
switch (cmp) {
if (!ret) {
switch (cmp) {
@@
-49,5
+49,11
@@
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
return ret;
}
return ret;
}
+static inline int
+futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
+{
+ return -ENOSYS;
+}
+
#endif
#endif
#endif
#endif