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/s390 | |
| 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 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/futex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/asm/futex.h b/arch/s390/include/asm/futex.h index 5e97a4353147..26f9144562c9 100644 --- a/arch/s390/include/asm/futex.h +++ b/arch/s390/include/asm/futex.h @@ -29,7 +29,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, mm_segment_t old_fs; old_fs = enable_sacf_uaccess(); - pagefault_disable(); switch (op) { case FUTEX_OP_SET: __futex_atomic_op("lr %2,%5\n", @@ -54,7 +53,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, default: ret = -ENOSYS; } - pagefault_enable(); disable_sacf_uaccess(old_fs); if (!ret) |