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

Commit 43b5fefc authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Benjamin Herrenschmidt
Browse files

powerpc/ppc32: Fixup pmd_page to work when ARCH_PFN_OFFSET is non-zero 



Instead of referencing mem_map directly, use pfn_to_page. Otherwise
the kernel crashes when trying to start userspace if ARCH_PFN_OFFSET is
non-zero and CONFIG_BOOKE is not defined

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6fe9d1fa

arch/powerpc/include/asm/pgtable-ppc32.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -287,7 +287,7 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry) 
#define pmd_page_vaddr(pmd)	\

#define pmd_page_vaddr(pmd)	\

	((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))

	((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))

#define pmd_page(pmd)		\

#define pmd_page(pmd)		\

	(mem_map + (pmd_val(pmd) >> PAGE_SHIFT))

	pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)

#else

#else

#define pmd_page_vaddr(pmd)	\

#define pmd_page_vaddr(pmd)	\

	((unsigned long) (pmd_val(pmd) & PAGE_MASK))

	((unsigned long) (pmd_val(pmd) & PAGE_MASK))