From e36f0694b7e6e39b3896b6f00f8083791bad4cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 10 Jan 2012 15:08:00 -0800 Subject: [PATCH] --- yaml --- r: 283015 b: refs/heads/master c: 9571a982903bf9dcbca2479fd3e7dafd2211ecf9 h: refs/heads/master i: 283013: ea867eb4f0018488604eaa78d5a7d17e66b74ef9 283011: 323feb71c74bdce75971ba33dee8d264db43b0a8 283007: 848b852ed9df07f1b434662924674f33d27e498f v: v3 --- [refs] | 2 +- trunk/mm/bootmem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 78f4f7592837..1af62440ea00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31b8384a555d94c78e2ea2284a323cb985441f60 +refs/heads/master: 9571a982903bf9dcbca2479fd3e7dafd2211ecf9 diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index 1a77012ecdb3..3e6f152f117e 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/mm/bootmem.c @@ -56,7 +56,7 @@ early_param("bootmem_debug", bootmem_debug_setup); static unsigned long __init bootmap_bytes(unsigned long pages) { - unsigned long bytes = (pages + 7) / 8; + unsigned long bytes = DIV_ROUND_UP(pages, 8); return ALIGN(bytes, sizeof(long)); } @@ -197,7 +197,7 @@ static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata) idx = start - bdata->node_min_pfn; vec = ~map[idx / BITS_PER_LONG]; - if (aligned && vec == ~0UL && start + BITS_PER_LONG < end) { + if (aligned && vec == ~0UL && start + BITS_PER_LONG <= end) { int order = ilog2(BITS_PER_LONG); __free_pages_bootmem(pfn_to_page(start), order);