2006-01-17 23:28:12

by Blaisorblade

Subject: [PATCH] uml: remove leftover from patch revertal

From: Paolo 'Blaisorblade' Giarrusso <[email protected]>

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]>
---

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

2006-01-17 23:54:41

by Jeff Dike

Subject: Re: [PATCH] uml: remove leftover from patch revertal

On Wed, Jan 18, 2006 at 12:26:27AM +0100, Paolo 'Blaisorblade' Giarrusso wrote:
>
> From: Paolo 'Blaisorblade' Giarrusso <[email protected]>
>
> 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