[PATCH] UML: x86-64 config support

This adds architecture-specific Kconfig support, plus Kconfig_i386 and
Kconfig_x86_64.  Currently the only option defined there is CONFIG_64_BIT.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/Kconfig_i386 b/arch/um/Kconfig_i386
index e2a5f6692cd67850e5411da955bc2889a490ddf1..342f50a0570961b77742502a2f20605f4ec77d32 100644 (file)
--- a/arch/um/Kconfig_i386
+++ b/arch/um/Kconfig_i386
@@ -1,3 +1,6 @@
+config 64_BIT
+       bool
+       default n
 config 3_LEVEL_PGTABLES
        bool "Three-level pagetables"
        default n

diff --git a/arch/um/Kconfig_x86_64 b/arch/um/Kconfig_x86_64
new file mode 100644 (file)
index 0000000..d61c852
--- /dev/null
+++ b/arch/um/Kconfig_x86_64
@@ -0,0 +1,7 @@
+config 64_BIT
+       bool
+       default y
+
+config 3_LEVEL_PGTABLES
+       bool
+       default y

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 62e78418b1ea2829fcf5b56f7f6d6d6f98e6b57a..b00c1a4adb24cf022e08f08d75c282dc5811d9d6 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -79,6 +79,8 @@ define archhelp
   echo '                  find in the kernel root.'
 endef
 
+$(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch)
+
 prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \
        $(ARCH_DIR)/kernel/vmlinux.lds.S