Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 2 insertions, 0 deletions

diff --git a/mm/bootmem.c b/mm/bootmem.c
index e8c567177dcf..16b9465eb4eb 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -204,6 +204,8 @@ restart_scan:
                 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))
                         continue;
                 for (j = i + 1; j < i + areasize; ++j) {