diff options
Diffstat (limited to 'arch/x86/include/asm/futex.h')
| -rw-r--r-- | arch/x86/include/asm/futex.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h index f373046e63ec..be27ba1e947a 100644 --- a/arch/x86/include/asm/futex.h +++ b/arch/x86/include/asm/futex.h | |||
| @@ -55,12 +55,6 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) | |||
| 55 | if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) | 55 | if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) |
| 56 | return -EFAULT; | 56 | return -EFAULT; |
| 57 | 57 | ||
| 58 | #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP) | ||
| 59 | /* Real i386 machines can only support FUTEX_OP_SET */ | ||
| 60 | if (op != FUTEX_OP_SET && boot_cpu_data.x86 == 3) | ||
| 61 | return -ENOSYS; | ||
| 62 | #endif | ||
| 63 | |||
| 64 | pagefault_disable(); | 58 | pagefault_disable(); |
| 65 | 59 | ||
| 66 | switch (op) { | 60 | switch (op) { |
| @@ -118,12 +112,6 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | |||
| 118 | { | 112 | { |
| 119 | int ret = 0; | 113 | int ret = 0; |
| 120 | 114 | ||
| 121 | #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP) | ||
| 122 | /* Real i386 machines have no cmpxchg instruction */ | ||
| 123 | if (boot_cpu_data.x86 == 3) | ||
| 124 | return -ENOSYS; | ||
| 125 | #endif | ||
| 126 | |||
| 127 | if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) | 115 | if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) |
| 128 | return -EFAULT; | 116 | return -EFAULT; |
| 129 | 117 | ||
