---

yaml --- r: 108464 b: refs/heads/master c: 627240a h: refs/heads/master v: v3
git-mirror · Aug 15, 2008 · 7f5acc1 · 7f5acc1
1 parent 380bbd2
commit 7f5acc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b635acec48bcaa9183fcbf4e3955616b0d4119b5
+refs/heads/master: 627240aaa92a4dc00d25584910b5f205e963747b
diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
@@ -473,7 +473,7 @@ static void * __init alloc_bootmem_core(struct bootmem_data *bdata,
 				goto find_block;
 			}
 
-		if (bdata->last_end_off &&
+		if (bdata->last_end_off & (PAGE_SIZE - 1) &&
 				PFN_DOWN(bdata->last_end_off) + 1 == sidx)
 			start_off = ALIGN(bdata->last_end_off, align);
 		else