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

Commit 50891457 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/mm: Fix a WARN_ON() with CONFIG_DEBUG_PAGEALLOC and CONFIG_DEBUG_VM 



Set need to call __set_pte_at() and not set_pte_at() from __change_page_attr()
since the later will perform checks with CONFIG_DEBUG_VM that aren't suitable
to the way we override an existing PTE. (More specifically, it doesn't let
you write over a present PTE).

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 030bdc3f

arch/powerpc/mm/pgtable_32.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static int __change_page_attr(struct page *page, pgprot_t prot) 
		return 0;

	if (!get_pteptr(&init_mm, address, &kpte, &kpmd))

		return -EINVAL;

	set_pte_at(&init_mm, address, kpte, mk_pte(page, prot));

	__set_pte_at(&init_mm, address, kpte, mk_pte(page, prot), 0);

	wmb();

#ifdef CONFIG_PPC_STD_MMU

	flush_hash_pages(0, address, pmd_val(*kpmd), 1);