diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:44 -0700 |
commit | 6f7dd68b755b215deda5188a2c13c00f4776ea66 (patch) | |
tree | 2a63c972ac89d7ae290910d5c6b1c6300ccbafd5 /mm/Kconfig | |
parent | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (diff) | |
parent | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f (diff) | |
download | kernel_replicant_linux-6f7dd68b755b215deda5188a2c13c00f4776ea66.tar.gz kernel_replicant_linux-6f7dd68b755b215deda5188a2c13c00f4776ea66.tar.bz2 kernel_replicant_linux-6f7dd68b755b215deda5188a2c13c00f4776ea66.zip |
Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
lmb: rename to memblock
Diffstat (limited to 'mm/Kconfig')
-rw-r--r-- | mm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 527136b22384..f4e516e9c37c 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -128,6 +128,9 @@ config SPARSEMEM_VMEMMAP pfn_to_page and page_to_pfn operations. This is the most efficient option when sufficient kernel resources are available. +config HAVE_MEMBLOCK + boolean + # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" |