4 files changed, 28 insertions, 102 deletions

diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
index 1460db219a8b..d2a5a59bd358 100644
--- a/arch/x86/include/asm/memblock.h
+++ b/arch/x86/include/asm/memblock.h
@@ -3,8 +3,6 @@
 
 #define ARCH_DISCARD_MEMBLOCK
 
-u64 memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align);
-
 void memblock_x86_reserve_range(u64 start, u64 end, char *name);
 void memblock_x86_free_range(u64 start, u64 end);
 struct range;
@@ -15,6 +13,5 @@ int get_free_all_memory_range(struct range **rangep, int nodeid);
 u64 memblock_x86_hole_size(u64 start, u64 end);
 u64 memblock_x86_free_memory_in_range(u64 addr, u64 limit);
 u64 memblock_x86_memory_in_range(u64 addr, u64 limit);
-bool memblock_x86_check_reserved_size(u64 *addrp, u64 *sizep, u64 align);
 
 #endif
diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c
index 95680fc4df5c..621cd23bb4e7 100644
--- a/arch/x86/kernel/check.c
+++ b/arch/x86/kernel/check.c
@@ -62,7 +62,8 @@ early_param("memory_corruption_check_size", set_corruption_check_size);
 
 void __init setup_bios_corruption_check(void)
 {
-        u64 addr = PAGE_SIZE;   /* assume first page is reserved anyway */
+        phys_addr_t start, end;
+        u64 i;
 
         if (memory_corruption_check == -1) {
                 memory_corruption_check =
@@ -82,28 +83,23 @@ void __init setup_bios_corruption_check(void)
 
         corruption_check_size = round_up(corruption_check_size, PAGE_SIZE);
 
-        while (addr < corruption_check_size && num_scan_areas < MAX_SCAN_AREAS) {
-                u64 size;
-                addr = memblock_x86_find_in_range_size(addr, &size, PAGE_SIZE);
+        for_each_free_mem_range(i, MAX_NUMNODES, &start, &end, NULL) {
+                start = clamp_t(phys_addr_t, round_up(start, PAGE_SIZE),
+                                PAGE_SIZE, corruption_check_size);
+                end = clamp_t(phys_addr_t, round_down(end, PAGE_SIZE),
+                              PAGE_SIZE, corruption_check_size);
+                if (start >= end)
+                        continue;
 
-                if (!addr)
-                        break;
-
-                if (addr >= corruption_check_size)
-                        break;
-
-                if ((addr + size) > corruption_check_size)
-                        size = corruption_check_size - addr;
-
-                memblock_x86_reserve_range(addr, addr + size, "SCAN RAM");
-                scan_areas[num_scan_areas].addr = addr;
-                scan_areas[num_scan_areas].size = size;
-                num_scan_areas++;
+                memblock_x86_reserve_range(start, end, "SCAN RAM");
+                scan_areas[num_scan_areas].addr = start;
+                scan_areas[num_scan_areas].size = end - start;
 
                 /* Assume we've already mapped this early memory */
-                memset(__va(addr), 0, size);
+                memset(__va(start), 0, end - start);
 
-                addr += size;
+                if (++num_scan_areas >= MAX_SCAN_AREAS)
+                        break;
         }
 
         if (num_scan_areas)
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
index 97fbc3973934..648d47d52a86 100644
--- a/arch/x86/mm/memblock.c
+++ b/arch/x86/mm/memblock.c
@@ -7,68 +7,6 @@
 #include <linux/mm.h>
 #include <linux/range.h>
 
-/* Check for already reserved areas */
-bool __init memblock_x86_check_reserved_size(u64 *addrp, u64 *sizep, u64 align)
-{
-        struct memblock_region *r;
-        u64 addr = *addrp, last;
-        u64 size = *sizep;
-        bool changed = false;
-
-again:
-        last = addr + size;
-        for_each_memblock(reserved, r) {
-                if (last > r->base && addr < r->base) {
-                        size = r->base - addr;
-                        changed = true;
-                        goto again;
-                }
-                if (last > (r->base + r->size) && addr < (r->base + r->size)) {
-                        addr = round_up(r->base + r->size, align);
-                        size = last - addr;
-                        changed = true;
-                        goto again;
-                }
-                if (last <= (r->base + r->size) && addr >= r->base) {
-                        *sizep = 0;
-                        return false;
-                }
-        }
-        if (changed) {
-                *addrp = addr;
-                *sizep = size;
-        }
-        return changed;
-}
-
-/*
- * Find next free range after start, and size is returned in *sizep
- */
-u64 __init memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align)
-{
-        struct memblock_region *r;
-
-        for_each_memblock(memory, r) {
-                u64 ei_start = r->base;
-                u64 ei_last = ei_start + r->size;
-                u64 addr;
-
-                addr = round_up(ei_start, align);
-                if (addr < start)
-                        addr = round_up(start, align);
-                if (addr >= ei_last)
-                        continue;
-                *sizep = ei_last - addr;
-                while (memblock_x86_check_reserved_size(&addr, sizep, align))
-                        ;
-
-                if (*sizep)
-                        return addr;
-        }
-
-        return 0;
-}
-
 static __init struct range *find_range_array(int count)
 {
         u64 end, size, mem;
diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c
index 92faf3a1c53e..46a5ff25eda4 100644
--- a/arch/x86/mm/memtest.c
+++ b/arch/x86/mm/memtest.c
@@ -70,24 +70,19 @@ static void __init memtest(u64 pattern, u64 start_phys, u64 size)
 
 static void __init do_one_pass(u64 pattern, u64 start, u64 end)
 {
-        u64 size = 0;
-
-        while (start < end) {
-                start = memblock_x86_find_in_range_size(start, &size, 1);
-
-                /* done ? */
-                if (start >= end)
-                        break;
-                if (start + size > end)
-                        size = end - start;
-
-                printk(KERN_INFO "  %010llx - %010llx pattern %016llx\n",
-                       (unsigned long long) start,
-                       (unsigned long long) start + size,
-                       (unsigned long long) cpu_to_be64(pattern));
-                memtest(pattern, start, size);
-
-                start += size;
+        u64 i;
+        phys_addr_t this_start, this_end;
+
+        for_each_free_mem_range(i, MAX_NUMNODES, &this_start, &this_end, NULL) {
+                this_start = clamp_t(phys_addr_t, this_start, start, end);
+                this_end = clamp_t(phys_addr_t, this_end, start, end);
+                if (this_start < this_end) {
+                        printk(KERN_INFO "  %010llx - %010llx pattern %016llx\n",
+                               (unsigned long long)this_start,
+                               (unsigned long long)this_end,
+                               (unsigned long long)cpu_to_be64(pattern));
+                        memtest(pattern, this_start, this_end - this_start);
+                }
         }
 }