aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2005-01-11 01:53:20 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-11 01:53:20 -0800
commit0c8e90d533d5ea2c60525687404c901a1d563d6d (patch)
tree1503706640dfa71077d317f75118b951763e2bfa /arch
parentdf69f7acb11b7bd78fd5ec8bcb216e0d70728e03 (diff)
downloadhistory-0c8e90d533d5ea2c60525687404c901a1d563d6d.tar.gz
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Kconfig_i3863
-rw-r--r--arch/um/Kconfig_x86_647
-rw-r--r--arch/um/Makefile2
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/um/Kconfig_i386 b/arch/um/Kconfig_i386
index e2a5f6692cd678..342f50a0570961 100644
--- 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
index 00000000000000..d61c852ed41f20
--- /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 62e78418b1ea28..b00c1a4adb24cf 100644
--- 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