Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index c83ff97f57f415c0f3eca4ee67d552ed410bd9e9..b8d9147e5c084de3264fc49ea93c95e22eddf49d 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -101,7 +101,6 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
 {
        phys_addr_t this_start, this_end, cand;
        u64 i;
-       int curr = movablemem_map.nr_map - 1;
 
        /* pump up @end */
        if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
@@ -115,28 +114,13 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
                this_start = clamp(this_start, start, end);
                this_end = clamp(this_end, start, end);
 
-restart:
-               if (this_end <= this_start || this_end < size)
+               if (this_end < size)
                        continue;
 
-               for (; curr >= 0; curr--) {
-                       if ((movablemem_map.map[curr].start_pfn << PAGE_SHIFT)
-                           < this_end)
-                               break;
-               }
-
                cand = round_down(this_end - size, align);
-               if (curr >= 0 &&
-                   cand < movablemem_map.map[curr].end_pfn << PAGE_SHIFT) {
-                       this_end = movablemem_map.map[curr].start_pfn
-                                  << PAGE_SHIFT;
-                       goto restart;
-               }
-
                if (cand >= this_start)
                        return cand;
        }
-
        return 0;
 }