aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2007-12-17 19:19:53 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 22:28:16 -0500
commita5ee6daa525c04079baee6f393c0b2dab3f61253 (patch)
tree5024bdedd14111e3cf6723a41390b2f80dec8bfd
parent2e12a7fb0d79d011ff9e0b09b53ca4438e5604de (diff)
sparsemem: make SPARSEMEM_VMEMMAP selectable
SPARSEMEM_VMEMMAP needs to be a selectable config option to support building the kernel both with and without sparsemem vmemmap support. This selection is desirable for platforms which could be configured one way for platform specific builds and the other for multi-platform builds. Signed-off-by: Miguel Botón <mboton@gmail.com> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Acked-by: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Christoph Lameter <clameter@sgi.com> Cc: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/Kconfig15
1 files changed, 7 insertions, 8 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index c070ec0c15bf..9ef97417a0b9 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -112,18 +112,17 @@ config SPARSEMEM_EXTREME
112 def_bool y 112 def_bool y
113 depends on SPARSEMEM && !SPARSEMEM_STATIC 113 depends on SPARSEMEM && !SPARSEMEM_STATIC
114 114
115#
116# SPARSEMEM_VMEMMAP uses a virtually mapped mem_map to optimise pfn_to_page
117# and page_to_pfn. The most efficient option where kernel virtual space is
118# not under pressure.
119#
120config SPARSEMEM_VMEMMAP_ENABLE 115config SPARSEMEM_VMEMMAP_ENABLE
121 def_bool n 116 def_bool n
122 117
123config SPARSEMEM_VMEMMAP 118config SPARSEMEM_VMEMMAP
124 bool 119 bool "Sparse Memory virtual memmap"
125 depends on SPARSEMEM 120 depends on SPARSEMEM && SPARSEMEM_VMEMMAP_ENABLE
126 default y if (SPARSEMEM_VMEMMAP_ENABLE) 121 default y
122 help
123 SPARSEMEM_VMEMMAP uses a virtually mapped memmap to optimise
124 pfn_to_page and page_to_pfn operations. This is the most
125 efficient option when sufficient kernel resources are available.
127 126
128# eventually, we can have this option just 'select SPARSEMEM' 127# eventually, we can have this option just 'select SPARSEMEM'
129config MEMORY_HOTPLUG 128config MEMORY_HOTPLUG