2005-09-16 18:02:41

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 1/1] UML - UML/i386 cmpxchg fix

This is 2.6.14 material, as it works in current mainline, and is a slight
improvment there.

In -rc1-mm1, this fixes a compilation breakage caused by the cmpxchg changes
in asm-i386/system.h.

Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.13-rc1-mm1/arch/um/Kconfig.i386
===================================================================
--- linux-2.6.13-rc1-mm1.orig/arch/um/Kconfig.i386 2005-09-16 12:33:07.000000000 -0400
+++ linux-2.6.13-rc1-mm1/arch/um/Kconfig.i386 2005-09-16 13:20:49.000000000 -0400
@@ -42,3 +42,7 @@
config ARCH_REUSE_HOST_VSYSCALL_AREA
bool
default y
+
+config X86_CMPXCHG
+ bool
+ default y
Index: linux-2.6.13-rc1-mm1/include/asm-um/system-i386.h
===================================================================
--- linux-2.6.13-rc1-mm1.orig/include/asm-um/system-i386.h 2005-08-28 19:41:01.000000000 -0400
+++ linux-2.6.13-rc1-mm1/include/asm-um/system-i386.h 2005-09-16 13:20:20.000000000 -0400
@@ -3,6 +3,4 @@

#include "asm/system-generic.h"

-#define __HAVE_ARCH_CMPXCHG 1
-
#endif