diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-09 09:34:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-09 09:34:20 -0800 |
| commit | 599c853195f43dfbcbf28b362e6ae80ffa33fec7 (patch) | |
| tree | 0a4730bd6cb2289bc3b81fdac1d42888d9de8e5f /include | |
| parent | 2f5c33b3180169f3eafb698b66686962d637fb0e (diff) | |
| parent | bf3dbdcd0bfca74c16ad0b2b5a978907c864ed4c (diff) | |
| download | blackbird-op-linux-599c853195f43dfbcbf28b362e6ae80ffa33fec7.tar.gz blackbird-op-linux-599c853195f43dfbcbf28b362e6ae80ffa33fec7.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] locking problem with __cpcmd.
[S390] don't call handle_mm_fault() if in an atomic context.
[S390] Fix vmalloc area size calculation.
[S390] Fix cpu hotplug (missing 'online' attribute).
[S390] cio: use barrier() in stsch_reset.
[S390] memory detection misses 128k.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/futex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-s390/futex.h b/include/asm-s390/futex.h index 5e261e1de671..5c5d02de49e9 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) { |
