Merge remote-tracking branch 'origin/x86/boot' into x86/mm2

Coming patches to x86/mm2 require the changes and advanced baseline in
x86/boot.

Resolved Conflicts:
	arch/x86/kernel/setup.c
	mm/nobootmem.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index ecc2f13d557d..03d152a76acf 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -137,6 +137,22 @@ unsigned long __init free_low_memory_core_early(int nodeid)
         return count;
 }
 
+static void reset_node_lowmem_managed_pages(pg_data_t *pgdat)
+{
+        struct zone *z;
+
+        /*
+         * In free_area_init_core(), highmem zone's managed_pages is set to
+         * present_pages, and bootmem allocator doesn't allocate from highmem
+         * zones. So there's no need to recalculate managed_pages because all
+         * highmem pages will be managed by the buddy system. Here highmem
+         * zone also includes highmem movable zone.
+         */
+        for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++)
+                if (!is_highmem(z))
+                        z->managed_pages = 0;
+}
+
 /**
  * free_all_bootmem - release free pages to the buddy allocator
  *
@@ -144,6 +160,11 @@ unsigned long __init free_low_memory_core_early(int nodeid)
  */
 unsigned long __init free_all_bootmem(void)
 {
+        struct pglist_data *pgdat;
+
+        for_each_online_pgdat(pgdat)
+                reset_node_lowmem_managed_pages(pgdat);
+
         /*
          * We need to use MAX_NUMNODES instead of NODE_DATA(0)->node_id
          *  because in some case like Node0 doesn't have RAM installed