diff options
Diffstat (limited to 'arch/cris/arch-v10/mm')
-rw-r--r-- | arch/cris/arch-v10/mm/fault.c | 3 | ||||
-rw-r--r-- | arch/cris/arch-v10/mm/tlb.c | 22 |
2 files changed, 1 insertions, 24 deletions
diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c index 087a2096f221..ed60588f8467 100644 --- a/arch/cris/arch-v10/mm/fault.c +++ b/arch/cris/arch-v10/mm/fault.c | |||
@@ -80,8 +80,7 @@ handle_mmu_bus_fault(struct pt_regs *regs) | |||
80 | * do_page_fault may have flushed the TLB so we have to restore | 80 | * do_page_fault may have flushed the TLB so we have to restore |
81 | * the MMU registers. | 81 | * the MMU registers. |
82 | */ | 82 | */ |
83 | local_save_flags(flags); | 83 | local_irq_save(flags); |
84 | local_irq_disable(); | ||
85 | pmd = (pmd_t *)(pgd + pgd_index(address)); | 84 | pmd = (pmd_t *)(pgd + pgd_index(address)); |
86 | if (pmd_none(*pmd)) | 85 | if (pmd_none(*pmd)) |
87 | goto exit; | 86 | goto exit; |
diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c index 4a496e4ffacc..21d78c599bab 100644 --- a/arch/cris/arch-v10/mm/tlb.c +++ b/arch/cris/arch-v10/mm/tlb.c | |||
@@ -134,28 +134,6 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) | |||
134 | local_irq_restore(flags); | 134 | local_irq_restore(flags); |
135 | } | 135 | } |
136 | 136 | ||
137 | /* dump the entire TLB for debug purposes */ | ||
138 | |||
139 | #if 0 | ||
140 | void | ||
141 | dump_tlb_all(void) | ||
142 | { | ||
143 | int i; | ||
144 | unsigned long flags; | ||
145 | |||
146 | printk("TLB dump. LO is: pfn | reserved | global | valid | kernel | we |\n"); | ||
147 | |||
148 | local_save_flags(flags); | ||
149 | local_irq_disable(); | ||
150 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { | ||
151 | *R_TLB_SELECT = ( IO_FIELD(R_TLB_SELECT, index, i) ); | ||
152 | printk("Entry %d: HI 0x%08lx, LO 0x%08lx\n", | ||
153 | i, *R_TLB_HI, *R_TLB_LO); | ||
154 | } | ||
155 | local_irq_restore(flags); | ||
156 | } | ||
157 | #endif | ||
158 | |||
159 | /* | 137 | /* |
160 | * Initialize the context related info for a new mm_struct | 138 | * Initialize the context related info for a new mm_struct |
161 | * instance. | 139 | * instance. |