summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-01-19 02:42:52 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-19 04:20:20 +0100
commit3b948068b84b9759cdf0965abf3074dcb9230e98 (patch)
tree2d95a403f0d130261b9d7cd9efa2af0005e75b65
parent[PATCH] uml: TT mode softint fixes (diff)
downloadlinux-3b948068b84b9759cdf0965abf3074dcb9230e98.tar.xz
linux-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 '')
-rw-r--r--include/asm-i386/futex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/futex.h b/include/asm-i386/futex.h
index e7a271d39309..44b9db806474 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