diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-13 10:15:39 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-13 10:15:39 -0800 |
| commit | da8543ef125afc7bba4da526b61a1ae07dc25109 (patch) | |
| tree | 6aec5867f8e054c22c6208032280ed1434c14a58 /mm/bootmem.c | |
| parent | ec637e3ffb6b978143652477c7c5f96c9519b691 (diff) | |
| parent | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (diff) | |
| download | linux-da8543ef125afc7bba4da526b61a1ae07dc25109.tar.gz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'mm/bootmem.c')
| -rw-r--r-- | mm/bootmem.c | 2 |
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) { |