diff options
| author | Tejun Heo <tj@kernel.org> | 2011-07-14 05:46:03 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-14 14:47:52 -0400 |
| commit | c378ddd53f9b8832a46fd4fec050a97fc2269858 (patch) | |
| tree | ef90f814ce569ef1cd3b6e64ea403d909f9d2c53 /mm/Kconfig | |
| parent | 474b881bf4ee86aba55d46a4fdf293de32cba91b (diff) | |
memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option
From 6839454ae63f1eb21e515c10229ca95c22955fec Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 14 Jul 2011 11:22:17 +0200
Make ARCH_DISCARD_MEMBLOCK a config option so that it can be handled
together with other MEMBLOCK options.
Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20110714094603.GH3455@htj.dyndns.org
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
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 30a5d4792b83..7c5697116fcf 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -134,6 +134,9 @@ config HAVE_MEMBLOCK | |||
| 134 | config HAVE_MEMBLOCK_NODE_MAP | 134 | config HAVE_MEMBLOCK_NODE_MAP |
| 135 | boolean | 135 | boolean |
| 136 | 136 | ||
| 137 | config ARCH_DISCARD_MEMBLOCK | ||
| 138 | boolean | ||
| 139 | |||
| 137 | # eventually, we can have this option just 'select SPARSEMEM' | 140 | # eventually, we can have this option just 'select SPARSEMEM' |
| 138 | config MEMORY_HOTPLUG | 141 | config MEMORY_HOTPLUG |
| 139 | bool "Allow for memory hot-add" | 142 | bool "Allow for memory hot-add" |