diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-28 11:50:26 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-29 13:23:02 -0800 |
| commit | e5bb8ad862a97a0facc83f3b81731de919fec6ad (patch) | |
| tree | f3778e2c0530ed51bb686d426d2af12491136111 /arch/x86/include/asm/futex.h | |
| parent | 7ac468b1300f35143a9b5b100e3970ca7ae1d9b8 (diff) | |
| download | talos-op-linux-e5bb8ad862a97a0facc83f3b81731de919fec6ad.tar.gz talos-op-linux-e5bb8ad862a97a0facc83f3b81731de919fec6ad.zip | |
x86, 386 removal: Remove CONFIG_BSWAP
All 486+ CPUs support BSWAP, so remove the fallback 386 support
code.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Link: http://lkml.kernel.org/r/1354132230-21854-5-git-send-email-hpa@linux.intel.com
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) if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP) - /* Real i386 machines can only support FUTEX_OP_SET */ - if (op != FUTEX_OP_SET && boot_cpu_data.x86 == 3) - return -ENOSYS; -#endif - pagefault_disable(); switch (op) { @@ -118,12 +112,6 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, { int ret = 0; -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP) - /* Real i386 machines have no cmpxchg instruction */ - if (boot_cpu_data.x86 == 3) - return -ENOSYS; -#endif - if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; |
