diff --git a/[refs] b/[refs] index 7635016380eb..316679f6b41c 100644 --- 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 index 4af15d0340ad..e023c68b0255 100644 --- 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