diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2020-03-28 11:59:24 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2020-03-28 11:59:24 +0100 |
commit | cf226c42b2d66b0f60d18fc2e44e68091fee6cef (patch) | |
tree | 6dae196f26ef862349481dc6fed875e42ded4fb4 /include | |
parent | 9e860351550b28901a78f122b1e2dc97f78ba369 (diff) | |
parent | f5544ba712afd1b01dd856c7eecfb5d30beaf920 (diff) |
Merge branch 'uaccess.futex' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into locking/core
Pull uaccess futex cleanups for Al Viro:
Consolidate access_ok() usage and the futex uaccess function zoo.
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/futex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h index 02970b11f71f..f4c3470480c7 100644 --- a/include/asm-generic/futex.h +++ b/include/asm-generic/futex.h @@ -34,7 +34,6 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) u32 tmp; preempt_disable(); - pagefault_disable(); ret = -EFAULT; if (unlikely(get_user(oldval, uaddr) != 0)) @@ -67,7 +66,6 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) ret = -EFAULT; out_pagefault_enable: - pagefault_enable(); preempt_enable(); if (ret == 0) |