Commit 090e77e1 authored Jun 04, 2020 by Ira Weiny Committed by Linus Torvalds Jun 04, 2020

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]
Suggested-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christian König <christian.koenig@amd.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Helge Deller <deller@gmx.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20200507150004.1423069-16-ira.weiny@intel.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent db6f1785

arch/arc/include/asm/highmem.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -25,9 +25,6 @@
		#define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT))
		#define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT)

		#define kmap_prot PAGE_KERNEL


		#include <asm/cacheflush.h>

		extern void kmap_init(void);

arch/arm/include/asm/highmem.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,6 @@
		#define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT)
		#define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT))

		#define kmap_prot PAGE_KERNEL

		#define flush_cache_kmaps() \
		do { \
		if (cache_is_vivt()) \

arch/csky/include/asm/highmem.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -38,8 +38,6 @@ extern void *kmap_atomic_pfn(unsigned long pfn);

		extern void kmap_init(void);

		#define kmap_prot PAGE_KERNEL

		#endif /* __KERNEL__ */

		#endif /* __ASM_CSKY_HIGHMEM_H */

arch/microblaze/include/asm/highmem.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#include <linux/uaccess.h>
		#include <asm/fixmap.h>

		#define kmap_prot PAGE_KERNEL
		extern pte_t *kmap_pte;
		extern pte_t *pkmap_page_table;

arch/mips/include/asm/highmem.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,6 @@ extern void *kmap_atomic_pfn(unsigned long pfn);

		extern void kmap_init(void);

		#define kmap_prot PAGE_KERNEL

		#endif /* __KERNEL__ */

		#endif /* _ASM_HIGHMEM_H */

Admin message