7 files changed, 71 insertions, 35 deletions

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 5051ce744b4e..ed46b7a6bc13 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -612,17 +612,6 @@ void __init free_early(u64 start, u64 end)
         early_res[j - 1].end = 0;
 }
 
-int __init page_is_reserved_early(unsigned long pagenr)
-{
-        u64 start = (u64)pagenr << PAGE_SHIFT;
-        int i;
-        struct early_res *r;
-
-        i = find_overlapped_early(start, start + PAGE_SIZE);
-        r = &early_res[i];
-        return (i < MAX_EARLY_RES && r->end);
-}
-
 void __init early_res_to_bootmem(u64 start, u64 end)
 {
         int i;
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index c3f119e99e0d..7c4d0255f8d8 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -100,7 +100,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
 #endif
 
 extern unsigned long find_max_low_pfn(void);
-extern void add_one_highpage_init(struct page *, int, int);
 extern unsigned long highend_pfn, highstart_pfn;
 
 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
@@ -432,10 +431,10 @@ void __init set_highmem_pages_init(int bad_ppro)
 {
 #ifdef CONFIG_HIGHMEM
         struct zone *zone;
-        struct page *page;
+        int nid;
 
         for_each_zone(zone) {
-                unsigned long node_pfn, zone_start_pfn, zone_end_pfn;
+                unsigned long zone_start_pfn, zone_end_pfn;
 
                 if (!is_highmem(zone))
                         continue;
@@ -443,16 +442,12 @@ void __init set_highmem_pages_init(int bad_ppro)
                 zone_start_pfn = zone->zone_start_pfn;
                 zone_end_pfn = zone_start_pfn + zone->spanned_pages;
 
+                nid = zone_to_nid(zone);
                 printk("Initializing %s for node %d (%08lx:%08lx)\n",
-                                zone->name, zone_to_nid(zone),
-                                zone_start_pfn, zone_end_pfn);
-
-                for (node_pfn = zone_start_pfn; node_pfn < zone_end_pfn; node_pfn++) {
-                        if (!pfn_valid(node_pfn))
-                                continue;
-                        page = pfn_to_page(node_pfn);
-                        add_one_highpage_init(page, node_pfn, bad_ppro);
-                }
+                                zone->name, nid, zone_start_pfn, zone_end_pfn);
+
+                add_highpages_with_active_regions(nid, zone_start_pfn,
+                                 zone_end_pfn, bad_ppro);
         }
         totalram_pages += totalhigh_pages;
 #endif
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index abadb1da70df..ba07a489230e 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -287,10 +287,10 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base)
         pkmap_page_table = pte;
 }
 
-void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
+static void __init
+add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
 {
-        if (page_is_ram(pfn) && !(bad_ppro && page_kills_ppro(pfn)) &&
-            !page_is_reserved_early(pfn)) {
+        if (!(bad_ppro && page_kills_ppro(pfn))) {
                 ClearPageReserved(page);
                 init_page_count(page);
                 __free_page(page);
@@ -299,18 +299,58 @@ void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
                 SetPageReserved(page);
 }
 
+struct add_highpages_data {
+        unsigned long start_pfn;
+        unsigned long end_pfn;
+        int bad_ppro;
+};
+
+static void __init add_highpages_work_fn(unsigned long start_pfn,
+                                         unsigned long end_pfn, void *datax)
+{
+        int node_pfn;
+        struct page *page;
+        unsigned long final_start_pfn, final_end_pfn;
+        struct add_highpages_data *data;
+        int bad_ppro;
+
+        data = (struct add_highpages_data *)datax;
+        bad_ppro = data->bad_ppro;
+
+        final_start_pfn = max(start_pfn, data->start_pfn);
+        final_end_pfn = min(end_pfn, data->end_pfn);
+        if (final_start_pfn >= final_end_pfn)
+                return;
+
+        for (node_pfn = final_start_pfn; node_pfn < final_end_pfn;
+             node_pfn++) {
+                if (!pfn_valid(node_pfn))
+                        continue;
+                page = pfn_to_page(node_pfn);
+                add_one_highpage_init(page, node_pfn, bad_ppro);
+        }
+
+}
+
+void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
+                                              unsigned long end_pfn,
+                                              int bad_ppro)
+{
+        struct add_highpages_data data;
+
+        data.start_pfn = start_pfn;
+        data.end_pfn = end_pfn;
+        data.bad_ppro = bad_ppro;
+
+        work_with_active_regions(nid, add_highpages_work_fn, &data);
+}
+
 #ifndef CONFIG_NUMA
 static void __init set_highmem_pages_init(int bad_ppro)
 {
-        int pfn;
+        add_highpages_with_active_regions(0, highstart_pfn, highend_pfn,
+                                                bad_ppro);
 
-        for (pfn = highstart_pfn; pfn < highend_pfn; pfn++) {
-                /*
-                 * Holes under sparsemem might not have no mem_map[]:
-                 */
-                if (pfn_valid(pfn))
-                        add_one_highpage_init(pfn_to_page(pfn), pfn, bad_ppro);
-        }
         totalram_pages += totalhigh_pages;
 }
 #endif /* !CONFIG_NUMA */
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 6b0ce745a60c..55d310596907 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -86,7 +86,6 @@ extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align);
 extern void reserve_early(u64 start, u64 end, char *name);
 extern void free_early(u64 start, u64 end);
 extern void early_res_to_bootmem(u64 start, u64 end);
-extern int page_is_reserved_early(unsigned long pagenr);
 extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);
 
 extern unsigned long e820_end_of_ram(void);
diff --git a/include/asm-x86/highmem.h b/include/asm-x86/highmem.h
index e153f3b44774..85c4fea41ff6 100644
--- a/include/asm-x86/highmem.h
+++ b/include/asm-x86/highmem.h
@@ -74,6 +74,9 @@ struct page *kmap_atomic_to_page(void *ptr);
 
 #define flush_cache_kmaps()     do { } while (0)
 
+extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,
+                                        unsigned long end_pfn, int bad_ppro);
+
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_HIGHMEM_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 034a3156d2f0..e4de460907c1 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1011,6 +1011,8 @@ extern unsigned long find_min_pfn_with_active_regions(void);
 extern unsigned long find_max_pfn_with_active_regions(void);
 extern void free_bootmem_with_active_regions(int nid,
                                                 unsigned long max_low_pfn);
+typedef void (*work_fn_t)(unsigned long, unsigned long, void *);
+extern void work_with_active_regions(int nid, work_fn_t work_fn, void *data);
 extern void sparse_memory_present_with_active_regions(int nid);
 #ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
 extern int early_pfn_to_nid(unsigned long pfn);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d80e1868e570..41c6e3aa059f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2929,6 +2929,14 @@ void __init free_bootmem_with_active_regions(int nid,
         }
 }
 
+void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data)
+{
+        int i;
+
+        for_each_active_range_index_in_nid(i, nid)
+                work_fn(early_node_map[i].start_pfn, early_node_map[i].end_pfn,
+                        data);
+}
 /**
  * sparse_memory_present_with_active_regions - Call memory_present for each active range
  * @nid: The node to call memory_present for. If MAX_NUMNODES, all nodes will be used.