aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-06-12 23:43:00 -0400
committerPaul Mackerras <paulus@samba.org>2006-06-12 23:43:00 -0400
commit31925323b1b51bb65db729e029472a8b1f635b7d (patch)
treee902a594508124adc74d07018834f5dce49af052
parent430644312810645a6e05855db50a978df9ba3ad3 (diff)
powerpc: Fix some missed ppc32 mm->context.id conversions
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/ppc/mm/init.c2
-rw-r--r--arch/ppc/mm/tlb.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 386e000bcb73..c9bd184a295a 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -583,7 +583,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
583 mm = (address < TASK_SIZE)? vma->vm_mm: &init_mm; 583 mm = (address < TASK_SIZE)? vma->vm_mm: &init_mm;
584 pmd = pmd_offset(pgd_offset(mm, address), address); 584 pmd = pmd_offset(pgd_offset(mm, address), address);
585 if (!pmd_none(*pmd)) 585 if (!pmd_none(*pmd))
586 add_hash_page(mm->context, address, pmd_val(*pmd)); 586 add_hash_page(mm->context.id, address, pmd_val(*pmd));
587 } 587 }
588#endif 588#endif
589} 589}
diff --git a/arch/ppc/mm/tlb.c b/arch/ppc/mm/tlb.c
index 6c3dc3c44c86..606b023196a2 100644
--- a/arch/ppc/mm/tlb.c
+++ b/arch/ppc/mm/tlb.c
@@ -42,7 +42,7 @@ void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, unsigned long addr)
42 42
43 if (Hash != 0) { 43 if (Hash != 0) {
44 ptephys = __pa(ptep) & PAGE_MASK; 44 ptephys = __pa(ptep) & PAGE_MASK;
45 flush_hash_pages(mm->context, addr, ptephys, 1); 45 flush_hash_pages(mm->context.id, addr, ptephys, 1);
46 } 46 }
47} 47}
48 48
@@ -102,7 +102,7 @@ static void flush_range(struct mm_struct *mm, unsigned long start,
102 pmd_t *pmd; 102 pmd_t *pmd;
103 unsigned long pmd_end; 103 unsigned long pmd_end;
104 int count; 104 int count;
105 unsigned int ctx = mm->context; 105 unsigned int ctx = mm->context.id;
106 106
107 if (Hash == 0) { 107 if (Hash == 0) {
108 _tlbia(); 108 _tlbia();
@@ -166,7 +166,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr)
166 mm = (vmaddr < TASK_SIZE)? vma->vm_mm: &init_mm; 166 mm = (vmaddr < TASK_SIZE)? vma->vm_mm: &init_mm;
167 pmd = pmd_offset(pgd_offset(mm, vmaddr), vmaddr); 167 pmd = pmd_offset(pgd_offset(mm, vmaddr), vmaddr);
168 if (!pmd_none(*pmd)) 168 if (!pmd_none(*pmd))
169 flush_hash_pages(mm->context, vmaddr, pmd_val(*pmd), 1); 169 flush_hash_pages(mm->context.id, vmaddr, pmd_val(*pmd), 1);
170 FINISH_FLUSH; 170 FINISH_FLUSH;
171} 171}
172 172