aboutsummaryrefslogtreecommitdiff
path: root/mm/nobootmem.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2014-09-14 22:17:40 -0700
committerGreg Kroah-Hartman2014-09-14 22:17:40 -0700
commit882ebfc28c389be86535bda4a7d9e407020356bf (patch)
treee8f3ddeda13196f40040f3ba4701ece5d38c63cc /mm/nobootmem.c
parent1c84cd48a117486166f3597c081b170b76e5bd81 (diff)
parent9e82bf014195d6f0054982c463575cdce24292be (diff)
Merge 3.17-rc5 into tty-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/nobootmem.c')
-rw-r--r--mm/nobootmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index 7ed58602e71b..7c7ab32ee503 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -119,6 +119,8 @@ static unsigned long __init free_low_memory_core_early(void)
phys_addr_t start, end;
u64 i;
+ memblock_clear_hotplug(0, -1);
+
for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL)
count += __free_memory_core(start, end);