sh: ioremap_prot support.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Sep 12, 2008 · cb700aa · cb700aa
1 parent 934135c
commit cb700aa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
@@ -12,6 +12,7 @@ config SUPERH
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_GENERIC_DMA_COHERENT
+	select HAVE_IOREMAP_PROT
 	help
 	  The SuperH is a RISC processor targeted for use in embedded systems
 	  and consumer electronics; it was also used in the Sega Dreamcast

diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
@@ -347,6 +347,8 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
 	__ioremap_mode((offset), (size), _PAGE_CACHABLE)
 #define p3_ioremap(offset, size, flags)			\
 	__ioremap((offset), (size), (flags))
+#define ioremap_prot(offset, size, flags)		\
+	__ioremap_mode((offset), (size), (flags))
 #define iounmap(addr)					\
 	__iounmap((addr))
 

diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
@@ -104,6 +104,8 @@ typedef struct { unsigned long pgd; } pgd_t;
 
 typedef struct page *pgtable_t;
 
+#define pte_pgprot(x) __pgprot(pte_val(x) & PTE_FLAGS_MASK)
+
 #endif /* !__ASSEMBLY__ */
 
 /*

diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h
@@ -76,6 +76,7 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #endif
 
 #define PTE_PHYS_MASK		(PHYS_ADDR_MASK & PAGE_MASK)
+#define PTE_FLAGS_MASK		(~(PTE_PHYS_MASK) << PAGE_SHIFT)
 
 #ifdef CONFIG_SUPERH32
 #define VMALLOC_START	(P3SEG)
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,6 +104,8 @@ typedef struct { unsigned long pgd; } pgd_t; @@
     typedef struct page *pgtable_t;
+    #define pte_pgprot(x) __pgprot(pte_val(x) & PTE_FLAGS_MASK)
     #endif /* !__ASSEMBLY__ */
     /*
@@ Expand Down @@