The patch titled Subject: riscv: use generic pgprot_* macros from <linux/pgtable.h> has been added to the -mm tree. Its filename is riscv-use-generic-pgprot_-macros-from-linux-pgtableh.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/riscv-use-generic-pgprot_-macros-from-linux-pgtableh.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/riscv-use-generic-pgprot_-macros-from-linux-pgtableh.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Pekka Enberg <penberg@xxxxxxxxxx> Subject: riscv: use generic pgprot_* macros from <linux/pgtable.h> The <linux/pgtable.h> header now defines generic pgprot_ macros also for the no-MMU configuration, so let's use them. Link: http://lkml.kernel.org/r/20200715053340.576300-2-penberg@xxxxxxxxx Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx> Cc: Tom Lendacky <thomas.lendacky@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/riscv/include/asm/mmio.h | 6 ------ 1 file changed, 6 deletions(-) --- a/arch/riscv/include/asm/mmio.h~riscv-use-generic-pgprot_-macros-from-linux-pgtableh +++ a/arch/riscv/include/asm/mmio.h @@ -14,12 +14,6 @@ #include <linux/types.h> #include <asm/mmiowb.h> -#ifndef CONFIG_MMU -#define pgprot_noncached(x) (x) -#define pgprot_writecombine(x) (x) -#define pgprot_device(x) (x) -#endif /* CONFIG_MMU */ - /* Generic IO read/write. These perform native-endian accesses. */ #define __raw_writeb __raw_writeb static inline void __raw_writeb(u8 val, volatile void __iomem *addr) _ Patches currently in -mm which might be from penberg@xxxxxxxxxx are mm-pgtable-make-generic-pgprot_-macros-available-for-no-mmu.patch riscv-use-generic-pgprot_-macros-from-linux-pgtableh.patch