* [PATCH] uml: remove leftover from patch revertal
@ 2006-01-17 23:26 Paolo 'Blaisorblade' Giarrusso
2006-01-18 0:46 ` Jeff Dike
0 siblings, 1 reply; 2+ messages in thread
From: Paolo 'Blaisorblade' Giarrusso @ 2006-01-17 23:26 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, user-mode-linux-devel
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
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>
---
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 e7a271d..44b9db8 100644
--- a/include/asm-i386/futex.h
+++ b/include/asm-i386/futex.h
@@ -61,7 +61,7 @@ futex_atomic_op_inuser (int encoded_op,
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] uml: remove leftover from patch revertal
2006-01-17 23:26 [PATCH] uml: remove leftover from patch revertal Paolo 'Blaisorblade' Giarrusso
@ 2006-01-18 0:46 ` Jeff Dike
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Dike @ 2006-01-18 0:46 UTC (permalink / raw)
To: Paolo 'Blaisorblade' Giarrusso
Cc: Andrew Morton, linux-kernel, user-mode-linux-devel
On Wed, Jan 18, 2006 at 12:26:27AM +0100, Paolo 'Blaisorblade' Giarrusso wrote:
>
> From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
>
> I added this line to share this file with UML, but now it's no longer shared so
> remove this useless leftover.
ACK - Thanks, I saw this and meant to remove it with the futex cleanup patch,
but it slipped my mind.
Jeff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-01-17 23:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-17 23:26 [PATCH] uml: remove leftover from patch revertal Paolo 'Blaisorblade' Giarrusso
2006-01-18 0:46 ` Jeff Dike
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).