Re: [uml-user] 2.6.14.git: user-mode-linux/x86_64 does not build

[Blaisorblade <blaisorblade@yahoo.it>]

On Saturday 12 November 2005 02:46, Junichi Uekawa wrote:
> Hi,
>
> UML does not build from linus's git tree for a while, with the
> following compilation error.

Ok, I must start catching up - I have lots of fixes but not yet found the time 
to re-read and send them. This is one of them.

> .config is attached later.

> CONFIG_X86_CMPXCHG=y

> CONFIG_RWSEM_GENERIC_SPINLOCK=y
> CONFIG_RWSEM_XCHGADD_ALGORITHM=y

This is what's causing the error, these options should be mutually exclusive. 

> CONFIG_64BIT=y
Arh, this is the problem... I made a mistake for x86_64, and the fix has not 
yet been sent up. Patch attached.
-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 018f076..563301f 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -35,12 +35,6 @@ config IRQ_RELEASE_METHOD
 	bool
 	default y
 
-menu "Host processor type and features"
-
-source "arch/i386/Kconfig.cpu"
-
-endmenu
-
 menu "UML-specific options"
 
 config MODE_TT
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index 5d92cac..c71b39a 100644
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -1,3 +1,9 @@
+menu "Host processor type and features"
+
+source "arch/i386/Kconfig.cpu"
+
+endmenu
+
 config UML_X86
 	bool
 	default y
@@ -42,7 +48,3 @@ config ARCH_HAS_SC_SIGNALS
 config ARCH_REUSE_HOST_VSYSCALL_AREA
 	bool
 	default y
-
-config X86_CMPXCHG
-	bool
-	default y
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 1f7dcb0..7a0e04e 100644
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -35,4 +35,3 @@ cflags-y += $(call cc-option,-mpreferred
 
 CFLAGS += $(cflags-y)
 USER_CFLAGS += $(cflags-y)
-