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

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

powerpc/mm: move __P and __S tables in the common pgtable.h 



__P and __S flags are the same for all platform and should remain
as is in the future, so avoid duplication.

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 093d7ca2

arch/powerpc/include/asm/book3s/64/pgtable.h

+0 −20
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ 
 * Write permissions imply read permissions for now (we could make write-only

 * pages on BookE but we don't bother for now). Execute permission control is

 * possible on platforms that define _PAGE_EXEC

 *

 * Note due to the way vm flags are laid out, the bits are XWR

 */

#define PAGE_NONE	__pgprot(_PAGE_BASE | _PAGE_PRIVILEGED)

#define PAGE_SHARED	__pgprot(_PAGE_BASE | _PAGE_RW)
@@ -162,24 +160,6 @@ 
#define PAGE_READONLY	__pgprot(_PAGE_BASE | _PAGE_READ)

#define PAGE_READONLY_X	__pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_EXEC)



#define __P000	PAGE_NONE

#define __P001	PAGE_READONLY

#define __P010	PAGE_COPY

#define __P011	PAGE_COPY

#define __P100	PAGE_READONLY_X

#define __P101	PAGE_READONLY_X

#define __P110	PAGE_COPY_X

#define __P111	PAGE_COPY_X



#define __S000	PAGE_NONE

#define __S001	PAGE_READONLY

#define __S010	PAGE_SHARED

#define __S011	PAGE_SHARED

#define __S100	PAGE_READONLY_X

#define __S101	PAGE_READONLY_X

#define __S110	PAGE_SHARED_X

#define __S111	PAGE_SHARED_X



/* Permission masks used for kernel mappings */

#define PAGE_KERNEL	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RW)

#define PAGE_KERNEL_NC	__pgprot(_PAGE_BASE_NC | _PAGE_KERNEL_RW | \

arch/powerpc/include/asm/pgtable.h

+19 −0
Original line number Diff line number Diff line
@@ -20,6 +20,25 @@ struct mm_struct; 
#include <asm/nohash/pgtable.h>

#endif /* !CONFIG_PPC_BOOK3S */



/* Note due to the way vm flags are laid out, the bits are XWR */

#define __P000	PAGE_NONE

#define __P001	PAGE_READONLY

#define __P010	PAGE_COPY

#define __P011	PAGE_COPY

#define __P100	PAGE_READONLY_X

#define __P101	PAGE_READONLY_X

#define __P110	PAGE_COPY_X

#define __P111	PAGE_COPY_X



#define __S000	PAGE_NONE

#define __S001	PAGE_READONLY

#define __S010	PAGE_SHARED

#define __S011	PAGE_SHARED

#define __S100	PAGE_READONLY_X

#define __S101	PAGE_READONLY_X

#define __S110	PAGE_SHARED_X

#define __S111	PAGE_SHARED_X



#ifndef __ASSEMBLY__



#include <asm/tlbflush.h>

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

+0 −20
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ static inline bool pte_user(pte_t pte) 
 * Write permissions imply read permissions for now (we could make write-only

 * pages on BookE but we don't bother for now). Execute permission control is

 * possible on platforms that define _PAGE_EXEC

 *

 * Note due to the way vm flags are laid out, the bits are XWR

 */

#define PAGE_NONE	__pgprot(_PAGE_BASE | _PAGE_NA)

#define PAGE_SHARED	__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW)
@@ -153,24 +151,6 @@ static inline bool pte_user(pte_t pte) 
#define PAGE_READONLY_X	__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO | \

				 _PAGE_EXEC)



#define __P000	PAGE_NONE

#define __P001	PAGE_READONLY

#define __P010	PAGE_COPY

#define __P011	PAGE_COPY

#define __P100	PAGE_READONLY_X

#define __P101	PAGE_READONLY_X

#define __P110	PAGE_COPY_X

#define __P111	PAGE_COPY_X



#define __S000	PAGE_NONE

#define __S001	PAGE_READONLY

#define __S010	PAGE_SHARED

#define __S011	PAGE_SHARED

#define __S100	PAGE_READONLY_X

#define __S101	PAGE_READONLY_X

#define __S110	PAGE_SHARED_X

#define __S111	PAGE_SHARED_X



/* Permission masks used for kernel mappings */

#define PAGE_KERNEL	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RW)

#define PAGE_KERNEL_NC	__pgprot(_PAGE_BASE_NC | _PAGE_KERNEL_RW | \