mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
mm: page_alloc: pass PFN to __free_pages_bootmem
__free_pages_bootmem prepares a page for release to the buddy allocator and assumes that the struct page is initialised. Parallel initialisation of struct pages defers initialisation and __free_pages_bootmem can be called for struct pages that cannot yet map struct page to PFN. This patch passes PFN to __free_pages_bootmem with no other functional change. Signed-off-by: Mel Gorman <[email protected]> Tested-by: Nate Zimmer <[email protected]> Tested-by: Waiman Long <[email protected]> Tested-by: Daniel J Blueman <[email protected]> Acked-by: Pekka Enberg <[email protected]> Cc: Robin Holt <[email protected]> Cc: Nate Zimmer <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Waiman Long <[email protected]> Cc: Scott Norton <[email protected]> Cc: "Luck, Tony" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
92923ca3aa
commit
d70ddd7a5d
5 changed files with 14 additions and 11 deletions
13
mm/bootmem.c
13
mm/bootmem.c
|
|
@ -164,7 +164,7 @@ void __init free_bootmem_late(unsigned long physaddr, unsigned long size)
|
|||
end = PFN_DOWN(physaddr + size);
|
||||
|
||||
for (; cursor < end; cursor++) {
|
||||
__free_pages_bootmem(pfn_to_page(cursor), 0);
|
||||
__free_pages_bootmem(pfn_to_page(cursor), cursor, 0);
|
||||
totalram_pages++;
|
||||
}
|
||||
}
|
||||
|
|
@ -172,7 +172,7 @@ void __init free_bootmem_late(unsigned long physaddr, unsigned long size)
|
|||
static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata)
|
||||
{
|
||||
struct page *page;
|
||||
unsigned long *map, start, end, pages, count = 0;
|
||||
unsigned long *map, start, end, pages, cur, count = 0;
|
||||
|
||||
if (!bdata->node_bootmem_map)
|
||||
return 0;
|
||||
|
|
@ -210,17 +210,17 @@ static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata)
|
|||
if (IS_ALIGNED(start, BITS_PER_LONG) && vec == ~0UL) {
|
||||
int order = ilog2(BITS_PER_LONG);
|
||||
|
||||
__free_pages_bootmem(pfn_to_page(start), order);
|
||||
__free_pages_bootmem(pfn_to_page(start), start, order);
|
||||
count += BITS_PER_LONG;
|
||||
start += BITS_PER_LONG;
|
||||
} else {
|
||||
unsigned long cur = start;
|
||||
cur = start;
|
||||
|
||||
start = ALIGN(start + 1, BITS_PER_LONG);
|
||||
while (vec && cur != start) {
|
||||
if (vec & 1) {
|
||||
page = pfn_to_page(cur);
|
||||
__free_pages_bootmem(page, 0);
|
||||
__free_pages_bootmem(page, cur, 0);
|
||||
count++;
|
||||
}
|
||||
vec >>= 1;
|
||||
|
|
@ -229,12 +229,13 @@ static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata)
|
|||
}
|
||||
}
|
||||
|
||||
cur = bdata->node_min_pfn;
|
||||
page = virt_to_page(bdata->node_bootmem_map);
|
||||
pages = bdata->node_low_pfn - bdata->node_min_pfn;
|
||||
pages = bootmem_bootmap_pages(pages);
|
||||
count += pages;
|
||||
while (pages--)
|
||||
__free_pages_bootmem(page++, 0);
|
||||
__free_pages_bootmem(page++, cur++, 0);
|
||||
|
||||
bdebug("nid=%td released=%lx\n", bdata - bootmem_node_data, count);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue