1 files changed, 6 insertions, 0 deletions

diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 252b8f5489ba..4500142bc4aa 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -1,6 +1,7 @@
 #include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/swap.h> /* for totalram_pages */
+#include <linux/bootmem.h>
 
 void *kmap(struct page *page)
 {
@@ -121,6 +122,11 @@ void __init set_highmem_pages_init(void)
         struct zone *zone;
         int nid;
 
+        /*
+         * Explicitly reset zone->managed_pages because set_highmem_pages_init()
+         * is invoked before free_all_bootmem()
+         */
+        reset_all_zones_managed_pages();
         for_each_zone(zone) {
                 unsigned long zone_start_pfn, zone_end_pfn;