diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-01-10 18:08:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 19:30:44 -0500 |
commit | 9571a982903bf9dcbca2479fd3e7dafd2211ecf9 (patch) | |
tree | 6a426c81c23cc4e5e81388c52ff37ed33a1187ac /mm/bootmem.c | |
parent | 31b8384a555d94c78e2ea2284a323cb985441f60 (diff) |
bootmem: micro optimize freeing pages in bulk
The first entry of bdata->node_bootmem_map holds the data for
bdata->node_min_pfn up to bdata->node_min_pfn + BITS_PER_LONG - 1. So the
test for freeing all pages of a single map entry can be slightly relaxed.
Moreover use DIV_ROUND_UP in another place instead of open coding it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Johannes Weiner <hannes@saeurebad.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r-- | mm/bootmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index 1a77012ecdb3..3e6f152f117e 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -56,7 +56,7 @@ early_param("bootmem_debug", bootmem_debug_setup); | |||
56 | 56 | ||
57 | static unsigned long __init bootmap_bytes(unsigned long pages) | 57 | static unsigned long __init bootmap_bytes(unsigned long pages) |
58 | { | 58 | { |
59 | unsigned long bytes = (pages + 7) / 8; | 59 | unsigned long bytes = DIV_ROUND_UP(pages, 8); |
60 | 60 | ||
61 | return ALIGN(bytes, sizeof(long)); | 61 | return ALIGN(bytes, sizeof(long)); |
62 | } | 62 | } |
@@ -197,7 +197,7 @@ static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata) | |||
197 | idx = start - bdata->node_min_pfn; | 197 | idx = start - bdata->node_min_pfn; |
198 | vec = ~map[idx / BITS_PER_LONG]; | 198 | vec = ~map[idx / BITS_PER_LONG]; |
199 | 199 | ||
200 | if (aligned && vec == ~0UL && start + BITS_PER_LONG < end) { | 200 | if (aligned && vec == ~0UL && start + BITS_PER_LONG <= end) { |
201 | int order = ilog2(BITS_PER_LONG); | 201 | int order = ilog2(BITS_PER_LONG); |
202 | 202 | ||
203 | __free_pages_bootmem(pfn_to_page(start), order); | 203 | __free_pages_bootmem(pfn_to_page(start), order); |