mm: fix alloc_bootmem_core to use fast searching for all nodes

[mv-sheeva.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index 2ccea700968f7ecaaa265023e79e52d540a82871..3c012fb58745cb2caaab61bc09387590479aed49 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -238,28 +238,32 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
         * We try to allocate bootmem pages above 'goal'
         * first, then we try to allocate lower pages.
         */
-       if (goal && goal >= bdata->node_boot_start && PFN_DOWN(goal) < end_pfn) {
-               preferred = goal - bdata->node_boot_start;
+       preferred = 0;
+       if (goal && PFN_DOWN(goal) < end_pfn) {
+               if (goal > bdata->node_boot_start)
+                       preferred = goal - bdata->node_boot_start;
 
                if (bdata->last_success >= preferred)
                        if (!limit || (limit && limit > bdata->last_success))
                                preferred = bdata->last_success;
-       } else
-               preferred = 0;
+       }
 
        preferred = PFN_DOWN(ALIGN(preferred, align)) + offset;
        areasize = (size + PAGE_SIZE-1) / PAGE_SIZE;
        incr = align >> PAGE_SHIFT ? : 1;
 
 restart_scan:
-       for (i = preferred; i < eidx; i += incr) {
+       for (i = preferred; i < eidx;) {
                unsigned long j;
+
                i = find_next_zero_bit(bdata->node_bootmem_map, eidx, i);
                i = ALIGN(i, incr);
                if (i >= eidx)
                        break;
-               if (test_bit(i, bdata->node_bootmem_map))
+               if (test_bit(i, bdata->node_bootmem_map)) {
+                       i += incr;
                        continue;
+               }
                for (j = i + 1; j < i + areasize; ++j) {
                        if (j >= eidx)
                                goto fail_block;
@@ -270,6 +274,8 @@ restart_scan:
                goto found;
        fail_block:
                i = ALIGN(j, incr);
+               if (i == j)
+                       i += incr;
        }
 
        if (preferred > offset) {