diff options
Diffstat (limited to 'mm/memory_hotplug.c')
-rw-r--r-- | mm/memory_hotplug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 489f235502db..cc2ab37220b7 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/swap.h> | 9 | #include <linux/swap.h> |
10 | #include <linux/interrupt.h> | 10 | #include <linux/interrupt.h> |
11 | #include <linux/pagemap.h> | 11 | #include <linux/pagemap.h> |
12 | #include <linux/bootmem.h> | ||
13 | #include <linux/compiler.h> | 12 | #include <linux/compiler.h> |
14 | #include <linux/export.h> | 13 | #include <linux/export.h> |
15 | #include <linux/pagevec.h> | 14 | #include <linux/pagevec.h> |
@@ -269,7 +268,7 @@ static void fix_zone_id(struct zone *zone, unsigned long start_pfn, | |||
269 | } | 268 | } |
270 | 269 | ||
271 | /* Can fail with -ENOMEM from allocating a wait table with vmalloc() or | 270 | /* Can fail with -ENOMEM from allocating a wait table with vmalloc() or |
272 | * alloc_bootmem_node_nopanic() */ | 271 | * alloc_bootmem_node_nopanic()/memblock_virt_alloc_node_nopanic() */ |
273 | static int __ref ensure_zone_is_initialized(struct zone *zone, | 272 | static int __ref ensure_zone_is_initialized(struct zone *zone, |
274 | unsigned long start_pfn, unsigned long num_pages) | 273 | unsigned long start_pfn, unsigned long num_pages) |
275 | { | 274 | { |
@@ -1446,6 +1445,7 @@ static int __init cmdline_parse_movable_node(char *p) | |||
1446 | * the kernel away from hotpluggable memory. | 1445 | * the kernel away from hotpluggable memory. |
1447 | */ | 1446 | */ |
1448 | memblock_set_bottom_up(true); | 1447 | memblock_set_bottom_up(true); |
1448 | movable_node_enabled = true; | ||
1449 | #else | 1449 | #else |
1450 | pr_warn("movable_node option not supported\n"); | 1450 | pr_warn("movable_node option not supported\n"); |
1451 | #endif | 1451 | #endif |