Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7d9b612 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

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: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 65f7d049

arch/powerpc/mm/init_64.c

+25 −23
Original line number Diff line number Diff line
@@ -255,13 +255,15 @@ static unsigned long vmemmap_list_free(unsigned long start) 
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_order = get_order(page_size);



	start = _ALIGN_DOWN(start, page_size);



	pr_debug("vmemmap_free %lx...%lx\n", start, end);



	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
@@ -272,8 +274,11 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) 
			continue;



		addr = vmemmap_list_free(start);

		if (addr) {

			struct page *page = pfn_to_page(addr >> PAGE_SHIFT);

		if (!addr)

			continue;



		page = pfn_to_page(addr >> PAGE_SHIFT);

		nr_pages = 1 << page_order;



		if (PageReserved(page)) {

			/* allocated from bootmem */
@@ -284,19 +289,16 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) 
				 */

				WARN_ON_ONCE(1);

			} else {

					unsigned int nr_pages =

						1 << get_order(page_size);

				while (nr_pages--)

					free_reserved_page(page++);

			}

			} else

				free_pages((unsigned long)(__va(addr)),

							get_order(page_size));

		} else {

			free_pages((unsigned long)(__va(addr)), page_order);

		}



		vmemmap_remove_mapping(start, page_size);

	}

}

}

#endif

void register_page_bootmem_memmap(unsigned long section_nr,

				  struct page *start_page, unsigned long size)