projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
include
/
asm-generic
/
futex.h
diff --git
a/include/asm-generic/futex.h
b/include/asm-generic/futex.h
index
df893c1
..
3c2344f
100644
(file)
--- a/
include/asm-generic/futex.h
+++ b/
include/asm-generic/futex.h
@@
-1,11
+1,9
@@
#ifndef _ASM_GENERIC_FUTEX_H
#define _ASM_GENERIC_FUTEX_H
#ifndef _ASM_GENERIC_FUTEX_H
#define _ASM_GENERIC_FUTEX_H
-#ifdef __KERNEL__
-
#include <linux/futex.h>
#include <linux/futex.h>
+#include <linux/uaccess.h>
#include <asm/errno.h>
#include <asm/errno.h>
-#include <asm/uaccess.h>
static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
@@
-21,7
+19,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
+31,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) {
@@
-56,4
+54,3
@@
futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
}
#endif
}
#endif
-#endif