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

Commit 96ecac96 authored by Rohit Vaswani's avatar Rohit Vaswani
Browse files

arm64: mm: Rename internal split_pmd API to not conflict with upstream 



Upstream commit "da141706 arm64: add better page protections to arm64"
added a split_pmd API which is different that the one used in
CONFIG_FORCE_PAGES, an internal debug feature. Rename the internal API
to allow the internal debug feature to compile and work as expected.

Change-Id: I0d4bc7d1a7fe22c1e4964662cc3820db4e247c38
Signed-off-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
parent 571603bf

arch/arm64/mm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static void __init map_mem(void) 
	memblock_set_current_limit(MEMBLOCK_ALLOC_ANYWHERE);

}

#ifdef CONFIG_FORCE_PAGES

static noinline void __init split_pmd(pmd_t *pmd, unsigned long addr,

static noinline void __init split_and_set_pmd(pmd_t *pmd, unsigned long addr,

				unsigned long end, unsigned long pfn)

{

	pte_t *pte, *start_pte;
@@ -668,7 +668,7 @@ static noinline void __init remap_pages(void) 
					next_pmd = pmd_addr_end(addr_pmd,

								next_pud);

					if (pmd_none(*pmd) || pmd_bad(*pmd))

						split_pmd(pmd, addr_pmd,

						split_and_set_pmd(pmd, addr_pmd,

					next_pmd, __phys_to_pfn(phys_pmd));

					pmd++;

					phys_pmd += next_pmd - addr_pmd;