提交 d7d9b612 编写于 作者: O Oliver O'Halloran 提交者: Michael Ellerman

powerpc/vmemmap: Reshuffle vmemmap_free()

Removes an indentation level and shuffles some code around to make the
following patch cleaner. No functional changes.
Reviewed-by: NBalbir Singh <bsingharora@gmail.com>
Signed-off-by: NOliver O'Halloran <oohall@gmail.com>
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
上级 65f7d049
...@@ -255,13 +255,15 @@ static unsigned long vmemmap_list_free(unsigned long start) ...@@ -255,13 +255,15 @@ static unsigned long vmemmap_list_free(unsigned long start)
void __ref vmemmap_free(unsigned long start, unsigned long end) void __ref vmemmap_free(unsigned long start, unsigned long end)
{ {
unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift; unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
unsigned long page_order = get_order(page_size);
start = _ALIGN_DOWN(start, page_size); start = _ALIGN_DOWN(start, page_size);
pr_debug("vmemmap_free %lx...%lx\n", start, end); pr_debug("vmemmap_free %lx...%lx\n", start, end);
for (; start < end; start += page_size) { for (; start < end; start += page_size) {
unsigned long addr; unsigned long nr_pages, addr;
struct page *page;
/* /*
* the section has already be marked as invalid, so * the section has already be marked as invalid, so
...@@ -272,8 +274,11 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) ...@@ -272,8 +274,11 @@ void __ref vmemmap_free(unsigned long start, unsigned long end)
continue; continue;
addr = vmemmap_list_free(start); addr = vmemmap_list_free(start);
if (addr) { if (!addr)
struct page *page = pfn_to_page(addr >> PAGE_SHIFT); continue;
page = pfn_to_page(addr >> PAGE_SHIFT);
nr_pages = 1 << page_order;
if (PageReserved(page)) { if (PageReserved(page)) {
/* allocated from bootmem */ /* allocated from bootmem */
...@@ -284,18 +289,15 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) ...@@ -284,18 +289,15 @@ void __ref vmemmap_free(unsigned long start, unsigned long end)
*/ */
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
} else { } else {
unsigned int nr_pages =
1 << get_order(page_size);
while (nr_pages--) while (nr_pages--)
free_reserved_page(page++); free_reserved_page(page++);
} }
} else } else {
free_pages((unsigned long)(__va(addr)), free_pages((unsigned long)(__va(addr)), page_order);
get_order(page_size)); }
vmemmap_remove_mapping(start, page_size); vmemmap_remove_mapping(start, page_size);
} }
}
} }
#endif #endif
void register_page_bootmem_memmap(unsigned long section_nr, void register_page_bootmem_memmap(unsigned long section_nr,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册