diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-01-18 17:42:52 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 19:20:20 -0800 |
commit | 3b948068b84b9759cdf0965abf3074dcb9230e98 (patch) | |
tree | 2d95a403f0d130261b9d7cd9efa2af0005e75b65 /include/asm-i386 | |
parent | 097fdf06c63741e6ac1a4e01c2255861dd0a1c49 (diff) | |
download | linux-3.10-3b948068b84b9759cdf0965abf3074dcb9230e98.tar.gz linux-3.10-3b948068b84b9759cdf0965abf3074dcb9230e98.tar.bz2 linux-3.10-3b948068b84b9759cdf0965abf3074dcb9230e98.zip |
[PATCH] uml: remove leftover from patch revertal
I added this line to share this file with UML, but now it's no longer
shared so remove this useless leftover.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386')
-rw-r--r-- | include/asm-i386/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/futex.h b/include/asm-i386/futex.h index e7a271d3930..44b9db80647 100644 --- a/include/asm-i386/futex.h +++ b/include/asm-i386/futex.h @@ -61,7 +61,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) if (op == FUTEX_OP_SET) __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg); else { -#if !defined(CONFIG_X86_BSWAP) && !defined(CONFIG_UML) +#ifndef CONFIG_X86_BSWAP if (boot_cpu_data.x86 == 3) ret = -ENOSYS; else |