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 /arch/parisc/include/asm/futex.h | |
parent | 9e860351550b28901a78f122b1e2dc97f78ba369 (diff) | |
parent | f5544ba712afd1b01dd856c7eecfb5d30beaf920 (diff) | |
download | linux-cf226c42b2d66b0f60d18fc2e44e68091fee6cef.tar.bz2 |
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 'arch/parisc/include/asm/futex.h')
-rw-r--r-- | arch/parisc/include/asm/futex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/futex.h b/arch/parisc/include/asm/futex.h index d2c3e4106851..c459f656c8c3 100644 --- a/arch/parisc/include/asm/futex.h +++ b/arch/parisc/include/asm/futex.h @@ -40,7 +40,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) u32 tmp; _futex_spin_lock_irqsave(uaddr, &flags); - pagefault_disable(); ret = -EFAULT; if (unlikely(get_user(oldval, uaddr) != 0)) @@ -73,7 +72,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -EFAULT; out_pagefault_enable: - pagefault_enable(); _futex_spin_unlock_irqrestore(uaddr, &flags); if (!ret) |