memblock, x86: Replace __get_free_all_memory_range() with for_each_free_mem_range()

__get_free_all_memory_range() walks memblock, calculates free memory
areas and fills in the specified range.  It can be easily replaced
with for_each_free_mem_range().

Convert free_low_memory_core_early() and
add_highpages_with_active_regions() to for_each_free_mem_range().
This leaves __get_free_all_memory_range() without any user.  Kill it
and related functions.

Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310462166-31469-10-git-send-email-tj@kernel.org
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 11 insertions, 17 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 5d173db93c4e..0c1da394a634 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -427,23 +427,17 @@ static void __init add_one_highpage_init(struct page *page)
 void __init add_highpages_with_active_regions(int nid,
                          unsigned long start_pfn, unsigned long end_pfn)
 {
-        struct range *range;
-        int nr_range;
-        int i;
-
-        nr_range = __get_free_all_memory_range(&range, nid, start_pfn, end_pfn);
-
-        for (i = 0; i < nr_range; i++) {
-                struct page *page;
-                int node_pfn;
-
-                for (node_pfn = range[i].start; node_pfn < range[i].end;
-                     node_pfn++) {
-                        if (!pfn_valid(node_pfn))
-                                continue;
-                        page = pfn_to_page(node_pfn);
-                        add_one_highpage_init(page);
-                }
+        phys_addr_t start, end;
+        u64 i;
+
+        for_each_free_mem_range(i, nid, &start, &end, NULL) {
+                unsigned long pfn = clamp_t(unsigned long, PFN_UP(start),
+                                            start_pfn, end_pfn);
+                unsigned long e_pfn = clamp_t(unsigned long, PFN_DOWN(end),
+                                              start_pfn, end_pfn);
+                for ( ; pfn < e_pfn; pfn++)
+                        if (pfn_valid(pfn))
+                                add_one_highpage_init(pfn_to_page(pfn));
         }
 }
 #else