projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
097fdf0
)
[PATCH] uml: remove leftover from patch revertal
author
Paolo 'Blaisorblade' Giarrusso
<
[email protected]
>
Thu, 19 Jan 2006 01:42:52 +0000
(17:42 -0800)
committer
Linus Torvalds
<
[email protected]
>
Thu, 19 Jan 2006 03:20:20 +0000
(19:20 -0800)
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 <
[email protected]
>
Acked-by: Jeff Dike <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
include/asm-i386/futex.h
patch
|
blob
|
history
diff --git
a/include/asm-i386/futex.h
b/include/asm-i386/futex.h
index e7a271d393099b3909cc329bf9fa90bbd2bb7e04..44b9db806474b9faabf19d9b6323b23279b4d0c6 100644
(file)
--- 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)
+#if
ndef CONFIG_X86_BSWAP
if (boot_cpu_data.x86 == 3)
ret = -ENOSYS;
else