diff options
Diffstat (limited to 'arch/mn10300')
-rw-r--r-- | arch/mn10300/include/asm/pgtable.h | 2 | ||||
-rw-r--r-- | arch/mn10300/mm/mmu-context.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mn10300/include/asm/pgtable.h b/arch/mn10300/include/asm/pgtable.h index 6dc30fc827c4..16d88577f3e0 100644 --- a/arch/mn10300/include/asm/pgtable.h +++ b/arch/mn10300/include/asm/pgtable.h | |||
@@ -466,7 +466,7 @@ static inline int set_kernel_exec(unsigned long vaddr, int enable) | |||
466 | * the kernel page tables containing the necessary information by tlb-mn10300.S | 466 | * the kernel page tables containing the necessary information by tlb-mn10300.S |
467 | */ | 467 | */ |
468 | extern void update_mmu_cache(struct vm_area_struct *vma, | 468 | extern void update_mmu_cache(struct vm_area_struct *vma, |
469 | unsigned long address, pte_t pte); | 469 | unsigned long address, pte_t *ptep); |
470 | 470 | ||
471 | #endif /* !__ASSEMBLY__ */ | 471 | #endif /* !__ASSEMBLY__ */ |
472 | 472 | ||
diff --git a/arch/mn10300/mm/mmu-context.c b/arch/mn10300/mm/mmu-context.c index 31c9d27a75ae..36ba02191d40 100644 --- a/arch/mn10300/mm/mmu-context.c +++ b/arch/mn10300/mm/mmu-context.c | |||
@@ -51,9 +51,10 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) | |||
51 | /* | 51 | /* |
52 | * preemptively set a TLB entry | 52 | * preemptively set a TLB entry |
53 | */ | 53 | */ |
54 | void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t pte) | 54 | void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) |
55 | { | 55 | { |
56 | unsigned long pteu, ptel, cnx, flags; | 56 | unsigned long pteu, ptel, cnx, flags; |
57 | pte_t pte = *ptep; | ||
57 | 58 | ||
58 | addr &= PAGE_MASK; | 59 | addr &= PAGE_MASK; |
59 | ptel = pte_val(pte) & ~(xPTEL_UNUSED1 | xPTEL_UNUSED2); | 60 | ptel = pte_val(pte) & ~(xPTEL_UNUSED1 | xPTEL_UNUSED2); |