[PATCH] Keep UML Kconfig in sync with x86

[PATCH] Keep UML Kconfig in sync with x86

[Jeff Dike]

Fix a 2.6.24-rc3 UML build breakage introduced by commit
1032c0ba9da5c5b53173ad2dcf8b2a2da78f8b17 - it introduces X86_32, with
many things which UML needs depending on it.

This patch adds definitions of X86_32 and RWSEM_XCHGADD_ALGORITHM to
the UML/i386 Kconfig.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---
 arch/um/Kconfig.i386 |    7 +++++++
 1 file changed, 7 insertions(+)

Index: linux-2.6/arch/um/Kconfig.i386
===================================================================
--- linux-2.6.orig/arch/um/Kconfig.i386	2007-11-19 12:49:30.000000000 -0500
+++ linux-2.6/arch/um/Kconfig.i386	2007-11-19 13:56:37.000000000 -0500
@@ -8,6 +8,13 @@ config UML_X86
 	bool
 	default y
 
+config X86_32
+       bool
+       default y
+
+config RWSEM_XCHGADD_ALGORITHM
+	def_bool y
+
 config 64BIT
 	bool
 	default n

Re: [PATCH] Keep UML Kconfig in sync with x86

[WANG Cong]

On Mon, Nov 19, 2007 at 02:02:24PM -0500, Jeff Dike wrote:
>Fix a 2.6.24-rc3 UML build breakage introduced by commit
>1032c0ba9da5c5b53173ad2dcf8b2a2da78f8b17 - it introduces X86_32, with
>many things which UML needs depending on it.
>
>This patch adds definitions of X86_32 and RWSEM_XCHGADD_ALGORITHM to
>the UML/i386 Kconfig.
>
>Signed-off-by: Jeff Dike <jdike@linux.intel.com>

Tested-by: WANG Cong <xiyou.wangcong@gmail.com>

Thanks, Jeff. With this and that patch[1], uml building works fine. ;)

[1] http://lkml.org/lkml/2007/11/15/231

Re: [PATCH] Keep UML Kconfig in sync with x86

[Al Viro]

On Mon, Nov 19, 2007 at 02:02:24PM -0500, Jeff Dike wrote:
> Fix a 2.6.24-rc3 UML build breakage introduced by commit
> 1032c0ba9da5c5b53173ad2dcf8b2a2da78f8b17 - it introduces X86_32, with
> many things which UML needs depending on it.
> 
> This patch adds definitions of X86_32 and RWSEM_XCHGADD_ALGORITHM to
> the UML/i386 Kconfig.

That's not enough, unfortunately.  If we go that way, we need to add
dependencies on !UML for several options.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 5fd6688..ddd3a25 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -12,7 +12,7 @@ if CRYPTO_HW
 
 config CRYPTO_DEV_PADLOCK
 	tristate "Support for VIA PadLock ACE"
-	depends on X86_32
+	depends on X86_32 && !UML
 	select CRYPTO_ALGAPI
 	help
 	  Some VIA processors come with an integrated crypto engine
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
index f5f2c76..2ea1e34 100644
--- a/kernel/Kconfig.instrumentation
+++ b/kernel/Kconfig.instrumentation
@@ -21,7 +21,7 @@ config PROFILING
 config OPROFILE
 	tristate "OProfile system profiling (EXPERIMENTAL)"
 	depends on PROFILING
-	depends on ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64
+	depends on (ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64) && !UML
 	help
 	  OProfile is a profiling system capable of profiling the
 	  whole system, include the kernel, kernel modules, libraries,
@@ -32,7 +32,7 @@ config OPROFILE
 config KPROBES
 	bool "Kprobes"
 	depends on KALLSYMS && MODULES
-	depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
+	depends on (X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32) && !UML
 	help
 	  Kprobes allows you to trap at almost any kernel address and
 	  execute a callback function.  register_kprobe() establishes