diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-09-12 20:41:05 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-09-12 20:41:05 +0900 |
| commit | cb700aa4f13d38726defab3060d3ebeaf67dc189 (patch) | |
| tree | 7d60e396368f649149d545a936e4ccebd83b8a0b /arch | |
| parent | 934135c19d8a1be435bae75aefc09b8ae1698b16 (diff) | |
| download | talos-op-linux-cb700aa4f13d38726defab3060d3ebeaf67dc189.tar.gz talos-op-linux-cb700aa4f13d38726defab3060d3ebeaf67dc189.zip | |
sh: ioremap_prot support.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/include/asm/io.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/page.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/pgtable.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index bbdcd6418ef5..434183eb4f12 100644 --- 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 index e49cfee95fb2..1857666136f2 100644 --- 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 index 77fb8bf02e4e..5871d78e47e5 100644 --- 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 index a4a8f8b93463..52220d70a096 100644 --- 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) |
