aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-01-11 01:00:26 -0500
committerPaul Mundt <lethal@linux-sh.org>2011-01-11 01:00:26 -0500
commit11e1ed6e88616be5489a43bc6297d9bb8464908b (patch)
treeb0d331e7badd3b0dcdff6d11d951c50a136de195 /arch
parentc81fc389255d287dbfb17a70cd172663f962341a (diff)
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')
-rw-r--r--arch/sh/include/asm/pgtable_32.h8
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 43528ec656ba..3cbedd21fd83 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)
231 _PAGE_EXT_KERN_EXEC)) 231 _PAGE_EXT_KERN_EXEC))
232 232
233#define PAGE_KERNEL_PCC(slot, type) \ 233#define PAGE_KERNEL_PCC(slot, type) \
234 __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \ 234 __pgprot(0)
235 _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \
236 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
237 _PAGE_EXT_KERN_WRITE | \
238 _PAGE_EXT_KERN_EXEC) \
239 (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \
240 (type))
241 235
242#elif defined(CONFIG_MMU) /* SH-X TLB */ 236#elif defined(CONFIG_MMU) /* SH-X TLB */
243#define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \ 237#define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \