From 95be8462246ce2b7564e769235d8f602af1748d8 Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Wed, 18 Jan 2006 17:42:52 -0800
Subject: [PATCH] --- yaml --- r: 18925 b: refs/heads/master c:
 3b948068b84b9759cdf0965abf3074dcb9230e98 h: refs/heads/master i:   18923:
 ac315b71aa32da4b72a44bb974f3f54cd8df9e7a v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-i386/futex.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index abd79a7a2219..1c2db6cacc88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 097fdf06c63741e6ac1a4e01c2255861dd0a1c49
+refs/heads/master: 3b948068b84b9759cdf0965abf3074dcb9230e98
diff --git a/trunk/include/asm-i386/futex.h b/trunk/include/asm-i386/futex.h
index e7a271d39309..44b9db806474 100644
--- a/trunk/include/asm-i386/futex.h
+++ b/trunk/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