diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/include/asm/pgtable.h | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/mem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index 21207e54825b..89f158731ce3 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h | |||
@@ -209,7 +209,7 @@ extern void paging_init(void); | |||
209 | * corresponding HPTE into the hash table ahead of time, instead of | 209 | * corresponding HPTE into the hash table ahead of time, instead of |
210 | * waiting for the inevitable extra hash-table miss exception. | 210 | * waiting for the inevitable extra hash-table miss exception. |
211 | */ | 211 | */ |
212 | extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t); | 212 | extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *); |
213 | 213 | ||
214 | extern int gup_hugepd(hugepd_t *hugepd, unsigned pdshift, unsigned long addr, | 214 | extern int gup_hugepd(hugepd_t *hugepd, unsigned pdshift, unsigned long addr, |
215 | unsigned long end, int write, struct page **pages, int *nr); | 215 | unsigned long end, int write, struct page **pages, int *nr); |
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index b9b152558f9c..311224cdb7ad 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -494,13 +494,13 @@ EXPORT_SYMBOL(flush_icache_user_range); | |||
494 | * This must always be called with the pte lock held. | 494 | * This must always be called with the pte lock held. |
495 | */ | 495 | */ |
496 | void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, | 496 | void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, |
497 | pte_t pte) | 497 | pte_t *ptep) |
498 | { | 498 | { |
499 | #ifdef CONFIG_PPC_STD_MMU | 499 | #ifdef CONFIG_PPC_STD_MMU |
500 | unsigned long access = 0, trap; | 500 | unsigned long access = 0, trap; |
501 | 501 | ||
502 | /* We only want HPTEs for linux PTEs that have _PAGE_ACCESSED set */ | 502 | /* We only want HPTEs for linux PTEs that have _PAGE_ACCESSED set */ |
503 | if (!pte_young(pte) || address >= TASK_SIZE) | 503 | if (!pte_young(*ptep) || address >= TASK_SIZE) |
504 | return; | 504 | return; |
505 | 505 | ||
506 | /* We try to figure out if we are coming from an instruction | 506 | /* We try to figure out if we are coming from an instruction |