aboutsummaryrefslogtreecommitdiff
path: root/mm/bootmem.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
commit9da305eb089c94c535d1790fd2dec16f44c1689f (patch)
treef37f07f148fd7a793233c7f15c0fa9f46212049d /mm/bootmem.c
parentd96212ed87d032d2d830e265aae14038dc1f8ad8 (diff)
parent14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff)
Merge branch 'master'
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r--mm/bootmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index e8c567177dc..16b9465eb4e 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) {