aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/Kconfig
diff options
context:
space:
mode:
authorDave Hansen <haveblue@us.ibm.com>2005-06-23 03:07:43 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 12:45:02 -0400
commit3f22ab276b931b72ea04b184c155b34d0362bfc3 (patch)
tree013e6ba32f4b2fcb66f9726ba6b2c6dc64f6622d /arch/i386/Kconfig
parent3a9da7655d2d5b7f790a370328cf093440c80496 (diff)
[PATCH] make each arch use mm/Kconfig
For all architectures, this just means that you'll see a "Memory Model" choice in your architecture menu. For those that implement DISCONTIGMEM, you may eventually want to make your ARCH_DISCONTIGMEM_ENABLE a "def_bool y" and make your users select DISCONTIGMEM right out of the new choice menu. The only disadvantage might be if you have some specific things that you need in your help option to explain something about DISCONTIGMEM. Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/Kconfig')
-rw-r--r--arch/i386/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 35ca3a17ed20..8e5242c8e09d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -783,7 +783,7 @@ comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
783comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" 783comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
784 depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI) 784 depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
785 785
786config DISCONTIGMEM 786config ARCH_DISCONTIGMEM_ENABLE
787 bool 787 bool
788 depends on NUMA 788 depends on NUMA
789 default y 789 default y
@@ -808,6 +808,8 @@ config HAVE_ARCH_ALLOC_REMAP
808 depends on NUMA 808 depends on NUMA
809 default y 809 default y
810 810
811source "mm/Kconfig"
812
811config HIGHPTE 813config HIGHPTE
812 bool "Allocate 3rd-level pagetables from highmem" 814 bool "Allocate 3rd-level pagetables from highmem"
813 depends on HIGHMEM4G || HIGHMEM64G 815 depends on HIGHMEM4G || HIGHMEM64G