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

powerpc/mm: Reduce redundancy in pgtable.h 



PAGE_KERNEL_TEXT, PAGE_KERNEL_EXEC and PAGE_AGP are the same
for all powerpcs.

Remove duplicated definitions.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/92254499430d13d99e4a4d7e9ad8e8284cb35380.1662544974.git.christophe.leroy@csgroup.eu
parent 73ea68ad

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

+0 −19
Original line number Diff line number Diff line
@@ -118,25 +118,6 @@ static inline bool pte_user(pte_t pte) 
#define PAGE_KERNEL_RO	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RO)

#define PAGE_KERNEL_ROX	__pgprot(_PAGE_BASE | _PAGE_KERNEL_ROX)



/*

 * Protection used for kernel text. We want the debuggers to be able to

 * set breakpoints anywhere, so don't write protect the kernel text

 * on platforms where such control is possible.

 */

#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) ||\

	defined(CONFIG_KPROBES) || defined(CONFIG_DYNAMIC_FTRACE)

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_X

#else

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_ROX

#endif



/* Make modules code happy. We don't set RO yet */

#define PAGE_KERNEL_EXEC	PAGE_KERNEL_X



/* Advertise special mapping type for AGP */

#define PAGE_AGP		(PAGE_KERNEL_NC)

#define HAVE_PAGE_AGP



#define PTE_INDEX_SIZE	PTE_SHIFT

#define PMD_INDEX_SIZE	0

#define PUD_INDEX_SIZE	0

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

+0 −19
Original line number Diff line number Diff line
@@ -164,22 +164,6 @@ 
#define PAGE_KERNEL_RO	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RO)

#define PAGE_KERNEL_ROX	__pgprot(_PAGE_BASE | _PAGE_KERNEL_ROX)



/*

 * Protection used for kernel text. We want the debuggers to be able to

 * set breakpoints anywhere, so don't write protect the kernel text

 * on platforms where such control is possible.

 */

#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) || \

	defined(CONFIG_KPROBES) || defined(CONFIG_DYNAMIC_FTRACE)

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_X

#else

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_ROX

#endif



/* Make modules code happy. We don't set RO yet */

#define PAGE_KERNEL_EXEC	PAGE_KERNEL_X

#define PAGE_AGP		(PAGE_KERNEL_NC)



#ifndef __ASSEMBLY__

/*

 * page table defines
@@ -335,9 +319,6 @@ extern unsigned long pci_io_base; 
#define IOREMAP_END	(KERN_IO_END - FIXADDR_SIZE)

#define FIXADDR_SIZE	SZ_32M



/* Advertise special mapping type for AGP */

#define HAVE_PAGE_AGP



#ifndef __ASSEMBLY__



/*

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

+0 −19
Original line number Diff line number Diff line
@@ -17,25 +17,6 @@ 
#define PAGE_KERNEL_RO	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RO)

#define PAGE_KERNEL_ROX	__pgprot(_PAGE_BASE | _PAGE_KERNEL_ROX)



/*

 * Protection used for kernel text. We want the debuggers to be able to

 * set breakpoints anywhere, so don't write protect the kernel text

 * on platforms where such control is possible.

 */

#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) ||\

	defined(CONFIG_KPROBES) || defined(CONFIG_DYNAMIC_FTRACE)

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_X

#else

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_ROX

#endif



/* Make modules code happy. We don't set RO yet */

#define PAGE_KERNEL_EXEC	PAGE_KERNEL_X



/* Advertise special mapping type for AGP */

#define PAGE_AGP		(PAGE_KERNEL_NC)

#define HAVE_PAGE_AGP



#ifndef __ASSEMBLY__



/* Generic accessors to PTE bits */

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 */



/*

 * Protection used for kernel text. We want the debuggers to be able to

 * set breakpoints anywhere, so don't write protect the kernel text

 * on platforms where such control is possible.

 */

#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) || \

	defined(CONFIG_KPROBES) || defined(CONFIG_DYNAMIC_FTRACE)

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_X

#else

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_ROX

#endif



/* Make modules code happy. We don't set RO yet */

#define PAGE_KERNEL_EXEC	PAGE_KERNEL_X



/* Advertise special mapping type for AGP */

#define PAGE_AGP		(PAGE_KERNEL_NC)

#define HAVE_PAGE_AGP



#ifndef __ASSEMBLY__



#ifndef MAX_PTRS_PER_PGD