diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
| commit | de8fdfbee55bdebd048ec45854c9c0fc30240c7f (patch) | |
| tree | 3c193ea8ced47b9018eb3bd1a73956d2b9d564fd /Documentation/memory-hotplug.txt | |
| parent | 6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (diff) | |
| parent | 171cef6d6ec6c1b4e95f2053545b2dd91931518b (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'Documentation/memory-hotplug.txt')
| -rw-r--r-- | Documentation/memory-hotplug.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt index 5de846d3ecc0..670f3ded0802 100644 --- a/Documentation/memory-hotplug.txt +++ b/Documentation/memory-hotplug.txt @@ -114,11 +114,11 @@ config options. Memory model -> Sparse Memory (CONFIG_SPARSEMEM) Allow for memory hot-add (CONFIG_MEMORY_HOTPLUG) -- To enable memory removal, the followings are also necessary +- To enable memory removal, the following are also necessary Allow for memory hot remove (CONFIG_MEMORY_HOTREMOVE) Page Migration (CONFIG_MIGRATION) -- For ACPI memory hotplug, the followings are also necessary +- For ACPI memory hotplug, the following are also necessary Memory hotplug (under ACPI Support menu) (CONFIG_ACPI_HOTPLUG_MEMORY) This option can be kernel module. |