diff options
author | Dave Hansen <haveblue@us.ibm.com> | 2005-10-29 21:16:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 00:40:44 -0400 |
commit | 3947be1969a9ce455ec30f60ef51efb10e4323d1 (patch) | |
tree | 0b4b3b4c268beb7aa88cb685cce48b6bb5053c47 /mm/Kconfig | |
parent | bdc8cb984576ab5b550c8b24c6fa111a873503e3 (diff) |
[PATCH] memory hotplug: sysfs and add/remove functions
This adds generic memory add/remove and supporting functions for memory
hotplug into a new file as well as a memory hotplug kernel config option.
Individual architecture patches will follow.
For now, disable memory hotplug when swsusp is enabled. There's a lot of
churn there right now. We'll fix it up properly once it calms down.
Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/Kconfig')
-rw-r--r-- | mm/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index f35a550ba4b9..1a4473fcb2ca 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
@@ -112,6 +112,14 @@ 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 | # eventually, we can have this option just 'select SPARSEMEM' | ||
116 | config MEMORY_HOTPLUG | ||
117 | bool "Allow for memory hot-add" | ||
118 | depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND | ||
119 | |||
120 | comment "Memory hotplug is currently incompatible with Software Suspend" | ||
121 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND | ||
122 | |||
115 | # Heavily threaded applications may benefit from splitting the mm-wide | 123 | # Heavily threaded applications may benefit from splitting the mm-wide |
116 | # page_table_lock, so that faults on different parts of the user address | 124 | # page_table_lock, so that faults on different parts of the user address |
117 | # space can be handled with less contention: split it at this NR_CPUS. | 125 | # space can be handled with less contention: split it at this NR_CPUS. |