Skip to content

L
linux-davinci
Commit 30442991 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files
Options

Formatting fixes. 

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 6b123979
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
arch/mips/mm/tlb-r4k.c
View file @ 30442991
...@@ -100,7 +100,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, ...@@ -100,7 +100,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
continue; continue;
/* Make sure all entries differ. */ /* Make sure all entries differ. */
write_c0_entryhi(CKSEG0 + write_c0_entryhi(CKSEG0 +
(idx << (PAGE_SHIFT + 1))); (idx << (PAGE_SHIFT + 1)));
mtc0_tlbw_hazard(); mtc0_tlbw_hazard();
tlb_write_indexed(); tlb_write_indexed();
} }
...@@ -250,13 +250,13 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) ...@@ -250,13 +250,13 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
idx = read_c0_index(); idx = read_c0_index();
ptep = pte_offset_map(pmdp, address); ptep = pte_offset_map(pmdp, address);
#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
write_c0_entrylo0(ptep->pte_high); write_c0_entrylo0(ptep->pte_high);
ptep++; ptep++;
write_c0_entrylo1(ptep->pte_high); write_c0_entrylo1(ptep->pte_high);
#else #else
write_c0_entrylo0(pte_val(*ptep++) >> 6); write_c0_entrylo0(pte_val(*ptep++) >> 6);
write_c0_entrylo1(pte_val(*ptep) >> 6); write_c0_entrylo1(pte_val(*ptep) >> 6);
#endif #endif
write_c0_entryhi(address | pid); write_c0_entryhi(address | pid);
mtc0_tlbw_hazard(); mtc0_tlbw_hazard();
...@@ -357,7 +357,8 @@ __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, ...@@ -357,7 +357,8 @@ __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
old_pagemask = read_c0_pagemask(); old_pagemask = read_c0_pagemask();
wired = read_c0_wired(); wired = read_c0_wired();
if (--temp_tlb_entry < wired) { if (--temp_tlb_entry < wired) {
printk(KERN_WARNING "No TLB space left for add_temporary_entry\n"); printk(KERN_WARNING
"No TLB space left for add_temporary_entry\n");
ret = -ENOSPC; ret = -ENOSPC;
goto out; goto out;
} }
...@@ -388,7 +389,7 @@ static void __init probe_tlb(unsigned long config) ...@@ -388,7 +389,7 @@ static void __init probe_tlb(unsigned long config)
* is not supported, we assume R4k style. Cpu probing already figured * is not supported, we assume R4k style. Cpu probing already figured
* out the number of tlb entries. * out the number of tlb entries.
*/ */
if ((c->processor_id & 0xff0000) == PRID_COMP_LEGACY) if ((c->processor_id & 0xff0000) == PRID_COMP_LEGACY)
return; return;
reg = read_c0_config1(); reg = read_c0_config1();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment