mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

powerpc: Finally remove _PAGE_USER

Browse source 
_PAGE_USER is now gone on all targets. Remove it completely.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/76ebe74fdaed4297a1d8203a61174650c1d8d278.1695659959.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2023-09-25 20:31:50 +02:00 committed by Michael Ellerman
parent ceaba662c0
commit 163a72fa89
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/powerpc/include/asm/nohash/pgtable.h
View file

@ -182,18 +182,14 @@ static inline int pte_young(pte_t pte)
}
/*
* Don't just check for any non zero bits in __PAGE_USER, since for book3e
* Don't just check for any non zero bits in __PAGE_READ, 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.
* _PAGE_READ. Need to explicitly match _PAGE_BAP_UR bit in that case too.
*/
#ifndef pte_read
static inline bool pte_read(pte_t pte)
{
#ifdef _PAGE_READ
return (pte_val(pte) & _PAGE_READ) == _PAGE_READ;
#else
return (pte_val(pte) & _PAGE_USER) == _PAGE_USER;
#endif
}
#endif
@ -205,7 +201,7 @@ static inline bool pte_read(pte_t pte)
static inline bool pte_access_permitted(pte_t pte, bool write)
{
/*
* A read-only access is controlled by _PAGE_USER bit.
* A read-only access is controlled by _PAGE_READ bit.
* We have _PAGE_READ set for WRITE and EXECUTE
*/
if (!pte_present(pte) || !pte_read(pte))