Commit 6cc07821 authored Sep 07, 2022 by Christophe Leroy Committed by Michael Ellerman Sep 26, 2022

powerpc/mm: Make PAGE_KERNEL_xxx macros grep-friendly

Avoid multi-lines to help getting a complete view when using
grep. They still remain under the 100 chars limit.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/3bc3f5a51949ee7f52dba36677db23d4337c7995.1662544980.git.christophe.leroy@csgroup.eu

parent b997b2f5

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -112,8 +112,7 @@ static inline bool pte_user(pte_t pte)
		/* 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 \| _PAGE_NO_CACHE)
		#define PAGE_KERNEL_NCG __pgprot(_PAGE_BASE_NC \| _PAGE_KERNEL_RW \| \
		_PAGE_NO_CACHE \| _PAGE_GUARDED)
		#define PAGE_KERNEL_NCG __pgprot(_PAGE_BASE_NC \| _PAGE_KERNEL_RW \| _PAGE_NO_CACHE \| _PAGE_GUARDED)
		#define PAGE_KERNEL_X __pgprot(_PAGE_BASE \| _PAGE_KERNEL_RWX)
		#define PAGE_KERNEL_RO __pgprot(_PAGE_BASE \| _PAGE_KERNEL_RO)
		#define PAGE_KERNEL_ROX __pgprot(_PAGE_BASE \| _PAGE_KERNEL_ROX)

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -117,8 +117,7 @@
		#define _PAGE_KERNEL_RW (_PAGE_PRIVILEGED \| _PAGE_RW \| _PAGE_DIRTY)
		#define _PAGE_KERNEL_RO (_PAGE_PRIVILEGED \| _PAGE_READ)
		#define _PAGE_KERNEL_ROX (_PAGE_PRIVILEGED \| _PAGE_READ \| _PAGE_EXEC)
		#define _PAGE_KERNEL_RWX (_PAGE_PRIVILEGED \| _PAGE_DIRTY \| \
		_PAGE_RW \| _PAGE_EXEC)
		#define _PAGE_KERNEL_RWX (_PAGE_PRIVILEGED \| _PAGE_DIRTY \| _PAGE_RW \| _PAGE_EXEC)
		/*
		* _PAGE_CHG_MASK masks of bits that are to be preserved across
		* pgprot changes
		@@ -156,10 +155,8 @@

		/* 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 \| \
		_PAGE_TOLERANT)
		#define PAGE_KERNEL_NCG __pgprot(_PAGE_BASE_NC \| _PAGE_KERNEL_RW \| \
		_PAGE_NON_IDEMPOTENT)
		#define PAGE_KERNEL_NC __pgprot(_PAGE_BASE_NC \| _PAGE_KERNEL_RW \| _PAGE_TOLERANT)
		#define PAGE_KERNEL_NCG __pgprot(_PAGE_BASE_NC \| _PAGE_KERNEL_RW \| _PAGE_NON_IDEMPOTENT)
		#define PAGE_KERNEL_X __pgprot(_PAGE_BASE \| _PAGE_KERNEL_RWX)
		#define PAGE_KERNEL_RO __pgprot(_PAGE_BASE \| _PAGE_KERNEL_RO)
		#define PAGE_KERNEL_ROX __pgprot(_PAGE_BASE \| _PAGE_KERNEL_ROX)

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,7 @@
		/* 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 \| _PAGE_NO_CACHE)
		#define PAGE_KERNEL_NCG __pgprot(_PAGE_BASE_NC \| _PAGE_KERNEL_RW \| \
		_PAGE_NO_CACHE \| _PAGE_GUARDED)
		#define PAGE_KERNEL_NCG __pgprot(_PAGE_BASE_NC \| _PAGE_KERNEL_RW \| _PAGE_NO_CACHE \| _PAGE_GUARDED)
		#define PAGE_KERNEL_X __pgprot(_PAGE_BASE \| _PAGE_KERNEL_RWX)
		#define PAGE_KERNEL_RO __pgprot(_PAGE_BASE \| _PAGE_KERNEL_RO)
		#define PAGE_KERNEL_ROX __pgprot(_PAGE_BASE \| _PAGE_KERNEL_ROX)