diff -urpN --exclude-from=/home/davej/.exclude bk-linus/mm/bootmem.c linux-2.5/mm/bootmem.c --- bk-linus/mm/bootmem.c 2002-11-21 02:24:41.000000000 +0000 +++ linux-2.5/mm/bootmem.c 2002-11-21 18:05:21.000000000 +0000 @@ -205,7 +205,7 @@ found: * of this allocation's buffer? If yes then we can 'merge' * the previous partial page with this allocation. */ - if (align <= PAGE_SIZE + if (align < PAGE_SIZE && bdata->last_offset && bdata->last_pos+1 == start) { offset = (bdata->last_offset+align-1) & ~(align-1); if (offset > PAGE_SIZE)