X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-s390%2Ffutex.h;h=5c5d02de49e9ae53fe5728fef181f1657fd4c3dc;hb=13c48c490208d9e70d8d66d56f96c5054db69af7;hp=5e261e1de6719bb99a638421e63eec8c02e5f79a;hpb=db1a19b38f3a85f475b4ad716c71be133d8ca48e;p=linux-2.6

diff --git a/include/asm-s390/futex.h b/include/asm-s390/futex.h
index 5e261e1de6..5c5d02de49 100644
--- a/include/asm-s390/futex.h
+++ b/include/asm-s390/futex.h
@@ -4,8 +4,8 @@
 #ifdef __KERNEL__
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/errno.h>
-#include <asm/uaccess.h>
 
 static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
 {
@@ -21,7 +21,9 @@ static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
 	if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
 		return -EFAULT;
 
+	pagefault_disable();
 	ret = uaccess.futex_atomic_op(op, uaddr, oparg, &oldval);
+	pagefault_enable();
 
 	if (!ret) {
 		switch (cmp) {