aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 01:31:40 -0400
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 01:31:40 -0400
commit5b19c9081fbd0882c936ec087bf9055a20251dec (patch)
tree3bfb5779699b485fcf524ea34dd227e42f74ae78 /arch/sh/mm
parent555ef1963029d19d2367acd09f6b9a6a0056f217 (diff)
sh: Support for SH7770/SH7780 CPU subtypes.
Merge support for SH7770 and SH7780 SH-4A subtypes. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r--arch/sh/mm/tlb-sh4.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/mm/tlb-sh4.c b/arch/sh/mm/tlb-sh4.c
index 115b1b6be40b..96e5fb0ac4fa 100644
--- a/arch/sh/mm/tlb-sh4.c
+++ b/arch/sh/mm/tlb-sh4.c
@@ -36,7 +36,9 @@ void update_mmu_cache(struct vm_area_struct * vma,
36 unsigned long vpn; 36 unsigned long vpn;
37 struct page *page; 37 struct page *page;
38 unsigned long pfn; 38 unsigned long pfn;
39#ifndef CONFIG_CPU_SUBTYPE_SH7780
39 unsigned long ptea; 40 unsigned long ptea;
41#endif
40 42
41 /* Ptrace may call this routine. */ 43 /* Ptrace may call this routine. */
42 if (vma && current->active_mm != vma->vm_mm) 44 if (vma && current->active_mm != vma->vm_mm)
@@ -59,10 +61,12 @@ void update_mmu_cache(struct vm_area_struct * vma,
59 ctrl_outl(vpn, MMU_PTEH); 61 ctrl_outl(vpn, MMU_PTEH);
60 62
61 pteval = pte_val(pte); 63 pteval = pte_val(pte);
64#ifndef CONFIG_CPU_SUBTYPE_SH7780
62 /* Set PTEA register */ 65 /* Set PTEA register */
63 /* TODO: make this look less hacky */ 66 /* TODO: make this look less hacky */
64 ptea = ((pteval >> 28) & 0xe) | (pteval & 0x1); 67 ptea = ((pteval >> 28) & 0xe) | (pteval & 0x1);
65 ctrl_outl(ptea, MMU_PTEA); 68 ctrl_outl(ptea, MMU_PTEA);
69#endif
66 70
67 /* Set PTEL register */ 71 /* Set PTEL register */
68 pteval &= _PAGE_FLAGS_HARDWARE_MASK; /* drop software flags */ 72 pteval &= _PAGE_FLAGS_HARDWARE_MASK; /* drop software flags */