Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31925323 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Fix some missed ppc32 mm->context.id conversions 



Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 43064431

arch/ppc/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 
		mm = (address < TASK_SIZE)? vma->vm_mm: &init_mm;

		pmd = pmd_offset(pgd_offset(mm, address), address);

		if (!pmd_none(*pmd))

			add_hash_page(mm->context, address, pmd_val(*pmd));

			add_hash_page(mm->context.id, address, pmd_val(*pmd));

	}

#endif

}

arch/ppc/mm/tlb.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, unsigned long addr) 


	if (Hash != 0) {

		ptephys = __pa(ptep) & PAGE_MASK;

		flush_hash_pages(mm->context, addr, ptephys, 1);

		flush_hash_pages(mm->context.id, addr, ptephys, 1);

	}

}
@@ -102,7 +102,7 @@ static void flush_range(struct mm_struct *mm, unsigned long start, 
	pmd_t *pmd;

	unsigned long pmd_end;

	int count;

	unsigned int ctx = mm->context;

	unsigned int ctx = mm->context.id;



	if (Hash == 0) {

		_tlbia();
@@ -166,7 +166,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr) 
	mm = (vmaddr < TASK_SIZE)? vma->vm_mm: &init_mm;

	pmd = pmd_offset(pgd_offset(mm, vmaddr), vmaddr);

	if (!pmd_none(*pmd))

		flush_hash_pages(mm->context, vmaddr, pmd_val(*pmd), 1);

		flush_hash_pages(mm->context.id, vmaddr, pmd_val(*pmd), 1);

	FINISH_FLUSH;

}