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

Commit 7021d86a authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Benjamin Herrenschmidt
Browse files

powerpc/mm: Make clear_fixmap() actually work 



The clear_fixmap() routine issues map_page() with flags set to 0.
Currently this causes a BUG_ON() inside the map_page(), as it assumes
that a PTE should be clear before mapping.

This patch makes the map_page() to trigger the BUG_ON() only if the
flags were set.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 02af87a7

arch/powerpc/mm/pgtable_32.c

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ int map_page(unsigned long va, phys_addr_t pa, int flags) 
		/* The PTE should never be already set nor present in the

		 * hash table

		 */

		BUG_ON(pte_val(*pg) & (_PAGE_PRESENT | _PAGE_HASHPTE));

		BUG_ON((pte_val(*pg) & (_PAGE_PRESENT | _PAGE_HASHPTE)) &&

		       flags);

		set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT,

						     __pgprot(flags)));

	}