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

Commit 075447fd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: Correctly account for PMD in mem_text_address_writeable"

parents 9bea3b1b 2f7d7527

arch/arm/mm/mmu.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1469,8 +1469,10 @@ void mem_text_address_writeable(unsigned long addr) 
	mem_unprotect.pmd_to_flush = mem_unprotect.pmd;

	mem_unprotect.pmd_to_flush = mem_unprotect.pmd;

	mem_unprotect.addr = addr & PAGE_MASK;

	mem_unprotect.addr = addr & PAGE_MASK;





#ifndef CONFIG_ARM_LPAE

	if (addr & SECTION_SIZE)

	if (addr & SECTION_SIZE)

		mem_unprotect.pmd++;

		mem_unprotect.pmd++;

#endif





	mem_unprotect.saved_pmd = *mem_unprotect.pmd;

	mem_unprotect.saved_pmd = *mem_unprotect.pmd;

	if ((mem_unprotect.saved_pmd & PMD_TYPE_MASK) != PMD_TYPE_SECT)

	if ((mem_unprotect.saved_pmd & PMD_TYPE_MASK) != PMD_TYPE_SECT)