Merge tag 'perf-urgent-for-mingo-5.7-20200403' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / include / asm-generic / futex.h

diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 02970b1..f4c3470 100644 (file)
--- 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)