diff --git a/[refs] b/[refs]
index 691bc39d4a67..df81a2592d4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff9569bc5558e958777fd43580f2ccd83733cdf6
+refs/heads/master: 66d43e98ea6ff291cd4e524386bfb99105feb180
diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
index e8c567177dcf..16b9465eb4eb 100644
--- a/trunk/mm/bootmem.c
+++ b/trunk/mm/bootmem.c
@@ -204,6 +204,8 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
 		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) {