diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 15:00:26 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 15:00:26 +0900 |
| commit | 11e1ed6e88616be5489a43bc6297d9bb8464908b (patch) | |
| tree | b0d331e7badd3b0dcdff6d11d951c50a136de195 /arch/sh | |
| parent | c81fc389255d287dbfb17a70cd172663f962341a (diff) | |
| download | linux-3.10-11e1ed6e88616be5489a43bc6297d9bb8464908b.tar.gz linux-3.10-11e1ed6e88616be5489a43bc6297d9bb8464908b.tar.bz2 linux-3.10-11e1ed6e88616be5489a43bc6297d9bb8464908b.zip | |
sh: Stub out legacy PCC pgprot encoding for X2 TLBs.
Presently it's still possible to reference the PAGE_KERNEL_PCC pgprot
encoding on X2 TLBs which simply don't support it at all. Convert this
over to follow the nommu behaviour and simply hand back an invalid pgprot
value so we error out properly.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/pgtable_32.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/sh/include/asm/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h index 43528ec656b..3cbedd21fd8 100644 --- a/arch/sh/include/asm/pgtable_32.h +++ b/arch/sh/include/asm/pgtable_32.h @@ -231,13 +231,7 @@ static inline unsigned long copy_ptea_attributes(unsigned long x) _PAGE_EXT_KERN_EXEC)) #define PAGE_KERNEL_PCC(slot, type) \ - __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \ - _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \ - _PAGE_EXT(_PAGE_EXT_KERN_READ | \ - _PAGE_EXT_KERN_WRITE | \ - _PAGE_EXT_KERN_EXEC) \ - (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \ - (type)) + __pgprot(0) #elif defined(CONFIG_MMU) /* SH-X TLB */ #define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \ |