summaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2005-09-21 18:37:14 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-21 16:16:29 -0700
commitc51179fb0c77ad91df5825f8f7eb670da97e137e (patch)
treee1f4b8abef1caf0be32a6d777074fd84a80ef165 /include/asm-i386
parentf62378fcfc9c13a57b0b69dbd43336a4df8155a5 (diff)
downloadop-kernel-dev-c51179fb0c77ad91df5825f8f7eb670da97e137e.zip
op-kernel-dev-c51179fb0c77ad91df5825f8f7eb670da97e137e.tar.gz
[PATCH] uml: adapt asm/futex.h to our arch
Follow up to 4732efbeb997189d9f9b04708dc26bf8613ed721 - uml must just reuse as-is the backing architecture support. There is a micro-fixup is needed for the included file, which won't affect i386 behaviour at all. I've not tested compilation on x86_64, only on x86, but the code is almost the same except the culprit test, so everything should be ok on x86_64 too. Cc: Jakub Jelinek <jakub@redhat.com> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386')
-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 44b9db8..e7a271d 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 {
-#ifndef CONFIG_X86_BSWAP
+#if !defined(CONFIG_X86_BSWAP) && !defined(CONFIG_UML)
if (boot_cpu_data.x86 == 3)
ret = -ENOSYS;
else
OpenPOWER on IntegriCloud