diff mbox series

[2/2] riscv: Use generic pgprot_* macros from <linux/pgtable.h>

Message ID 20200714100051.345018-2-penberg@gmail.com (mailing list archive)
State New, archived
Headers show
Series [1/2] mm: pgtable: Make generic pgprot_* macros available for no-MMU | expand

Commit Message

Pekka Enberg July 14, 2020, 10 a.m. UTC 
From: Pekka Enberg <penberg@kernel.org>

The <linux/pgtable.h> header now defines generic pgprot_ macros also for
the no-MMU configuration, so let's use them.

Cc: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---
 arch/riscv/include/asm/mmio.h | 6 ------
 1 file changed, 6 deletions(-)
diff mbox series

Patch

diff --git a/arch/riscv/include/asm/mmio.h b/arch/riscv/include/asm/mmio.h
index 56053c9838b2..aff6c33ab0c0 100644
--- a/arch/riscv/include/asm/mmio.h
+++ b/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)