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

Commit e0f57031 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Move pte_user() into nohash/pgtable.h 



Now the pte-common.h is only for nohash platforms, lets
move pte_user() helper out of pte-common.h to put it
together with other helpers.

Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b2133bd7

arch/powerpc/include/asm/nohash/pgtable.h

+10 −0
Original line number Diff line number Diff line
@@ -51,6 +51,16 @@ static inline bool pte_hw_valid(pte_t pte) 
	return pte_val(pte) & _PAGE_PRESENT;

}



/*

 * Don't just check for any non zero bits in __PAGE_USER, since for book3e

 * and PTE_64BIT, PAGE_KERNEL_X contains _PAGE_BAP_SR which is also in

 * _PAGE_USER.  Need to explicitly match _PAGE_BAP_UR bit in that case too.

 */

static inline bool pte_user(pte_t pte)

{

	return (pte_val(pte) & (_PAGE_USER | _PAGE_PRIVILEGED)) == _PAGE_USER;

}



/*

 * We only find page table entry in the last level

 * Hence no need for other accessors

arch/powerpc/include/asm/pte-common.h

+0 −13
Original line number Diff line number Diff line
@@ -66,19 +66,6 @@ 
#define _PTE_NONE_MASK	0

#endif



#ifndef __ASSEMBLY__



/*

 * Don't just check for any non zero bits in __PAGE_USER, since for book3e

 * and PTE_64BIT, PAGE_KERNEL_X contains _PAGE_BAP_SR which is also in

 * _PAGE_USER.  Need to explicitly match _PAGE_BAP_UR bit in that case too.

 */

static inline bool pte_user(pte_t pte)

{

	return (pte_val(pte) & (_PAGE_USER | _PAGE_PRIVILEGED)) == _PAGE_USER;

}

#endif /* __ASSEMBLY__ */



/* Location of the PFN in the PTE. Most 32-bit platforms use the same

 * as _PAGE_SHIFT here (ie, naturally aligned).

 * Platform who don't just pre-define the value so we don't override it here