From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: [patch 040/127] kmap: consolidate kmap_prot definitions Date: Thu, 04 Jun 2020 16:48:18 -0700 Message-ID: <20200604234818.lUfDFddWq%akpm@linux-foundation.org> References: <20200604164523.e15f3177f4b69dcb4f2534a1@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail.kernel.org ([198.145.29.99]:44534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725930AbgFDXsV (ORCPT ); Thu, 4 Jun 2020 19:48:21 -0400 In-Reply-To: <20200604164523.e15f3177f4b69dcb4f2534a1@linux-foundation.org> Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, benh@kernel.crashing.org, bp@alien8.de, chris@zankel.net, christian.koenig@amd.com, dan.j.williams@intel.com, daniel.vetter@ffwll.ch, dave.hansen@linux.intel.com, davem@davemloft.net, deller@gmx.de, hch@infradead.org, hpa@zytor.com, ira.weiny@intel.com, James.Bottomley@HansenPartnership.com, jcmvbkbc@gmail.com, linux-mm@kvack.org, luto@kernel.org, mingo@redhat.com, mm-commits@vger.kernel.org, paulus@samba.org, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, tsbogend@alpha.franken.de, viro@zeniv.linux.org.uk =46rom: Ira Weiny Subject: kmap: consolidate kmap_prot definitions Most architectures define kmap_prot to be PAGE_KERNEL. Let sparc and xtensa define there own and define PAGE_KERNEL as the default if not overridden. [akpm@linux-foundation.org: coding style fixes] Link: http://lkml.kernel.org/r/20200507150004.1423069-16-ira.weiny@intel.com Signed-off-by: Ira Weiny Suggested-by: Christoph Hellwig Cc: Al Viro Cc: Andy Lutomirski Cc: Benjamin Herrenschmidt Cc: Borislav Petkov Cc: Christian K=C3=B6nig Cc: Chris Zankel Cc: Daniel Vetter Cc: Dan Williams Cc: Dave Hansen Cc: "David S. Miller" Cc: Helge Deller Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: "James E.J. Bottomley" Cc: Max Filippov Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Bogendoerfer Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/arc/include/asm/highmem.h | 3 --- arch/arm/include/asm/highmem.h | 2 -- arch/csky/include/asm/highmem.h | 2 -- arch/microblaze/include/asm/highmem.h | 1 - arch/mips/include/asm/highmem.h | 2 -- arch/nds32/include/asm/highmem.h | 1 - arch/powerpc/include/asm/highmem.h | 1 - arch/sparc/include/asm/highmem.h | 3 ++- arch/sparc/mm/highmem.c | 4 ---- arch/x86/include/asm/fixmap.h | 1 - include/linux/highmem.h | 4 ++++ 11 files changed, 6 insertions(+), 18 deletions(-) --- a/arch/arc/include/asm/highmem.h~kmap-consolidate-kmap_prot-definitions +++ a/arch/arc/include/asm/highmem.h @@ -25,9 +25,6 @@ #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) #define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT) =20 -#define kmap_prot PAGE_KERNEL - - #include =20 extern void kmap_init(void); --- a/arch/arm/include/asm/highmem.h~kmap-consolidate-kmap_prot-definitions +++ a/arch/arm/include/asm/highmem.h @@ -10,8 +10,6 @@ #define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT) #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) =20 -#define kmap_prot PAGE_KERNEL - #define flush_cache_kmaps() \ do { \ if (cache_is_vivt()) \ --- a/arch/csky/include/asm/highmem.h~kmap-consolidate-kmap_prot-definitions +++ a/arch/csky/include/asm/highmem.h @@ -38,8 +38,6 @@ extern void *kmap_atomic_pfn(unsigned lo =20 extern void kmap_init(void); =20 -#define kmap_prot PAGE_KERNEL - #endif /* __KERNEL__ */ =20 #endif /* __ASM_CSKY_HIGHMEM_H */ --- a/arch/microblaze/include/asm/highmem.h~kmap-consolidate-kmap_prot-defi= nitions +++ a/arch/microblaze/include/asm/highmem.h @@ -25,7 +25,6 @@ #include #include =20 -#define kmap_prot PAGE_KERNEL extern pte_t *kmap_pte; extern pte_t *pkmap_page_table; =20 --- a/arch/mips/include/asm/highmem.h~kmap-consolidate-kmap_prot-definitions +++ a/arch/mips/include/asm/highmem.h @@ -54,8 +54,6 @@ extern void *kmap_atomic_pfn(unsigned lo =20 extern void kmap_init(void); =20 -#define kmap_prot PAGE_KERNEL - #endif /* __KERNEL__ */ =20 #endif /* _ASM_HIGHMEM_H */ --- a/arch/nds32/include/asm/highmem.h~kmap-consolidate-kmap_prot-definitio= ns +++ a/arch/nds32/include/asm/highmem.h @@ -32,7 +32,6 @@ #define LAST_PKMAP_MASK (LAST_PKMAP - 1) #define PKMAP_NR(virt) (((virt) - (PKMAP_BASE)) >> PAGE_SHIFT) #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -#define kmap_prot PAGE_KERNEL =20 static inline void flush_cache_kmaps(void) { --- a/arch/powerpc/include/asm/highmem.h~kmap-consolidate-kmap_prot-definit= ions +++ a/arch/powerpc/include/asm/highmem.h @@ -29,7 +29,6 @@ #include #include =20 -#define kmap_prot PAGE_KERNEL extern pte_t *kmap_pte; extern pte_t *pkmap_page_table; =20 --- a/arch/sparc/include/asm/highmem.h~kmap-consolidate-kmap_prot-definitio= ns +++ a/arch/sparc/include/asm/highmem.h @@ -25,11 +25,12 @@ #include #include #include +#include =20 /* declarations for highmem.c */ extern unsigned long highstart_pfn, highend_pfn; =20 -extern pgprot_t kmap_prot; +#define kmap_prot __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE) extern pte_t *pkmap_page_table; =20 void kmap_init(void) __init; --- a/arch/sparc/mm/highmem.c~kmap-consolidate-kmap_prot-definitions +++ a/arch/sparc/mm/highmem.c @@ -32,9 +32,6 @@ #include #include =20 -pgprot_t kmap_prot; -EXPORT_SYMBOL(kmap_prot); - static pte_t *kmap_pte; =20 void __init kmap_init(void) @@ -51,7 +48,6 @@ void __init kmap_init(void) =20 /* cache the first kmap pte */ kmap_pte =3D pte_offset_kernel(dir, address); - kmap_prot =3D __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE); } =20 void *kmap_atomic_high_prot(struct page *page, pgprot_t prot) --- a/arch/x86/include/asm/fixmap.h~kmap-consolidate-kmap_prot-definitions +++ a/arch/x86/include/asm/fixmap.h @@ -152,7 +152,6 @@ extern void reserve_top_address(unsigned extern int fixmaps_set; =20 extern pte_t *kmap_pte; -#define kmap_prot PAGE_KERNEL extern pte_t *pkmap_page_table; =20 void __native_set_fixmap(enum fixed_addresses idx, pte_t pte); --- a/include/linux/highmem.h~kmap-consolidate-kmap_prot-definitions +++ a/include/linux/highmem.h @@ -40,6 +40,10 @@ extern void kunmap_atomic_high(void *kva static inline void kmap_flush_tlb(unsigned long addr) { } #endif =20 +#ifndef kmap_prot +#define kmap_prot PAGE_KERNEL +#endif + void *kmap_high(struct page *page); static inline void *kmap(struct page *page) { _