arch/powerpc/mm/pgtable.c: another missed conversion

akpm00 · torvalds · commit 78c24f7beeae · 2020-06-10T14:44:46.000-07:00
Fixes: e05c7b1 ("mm: pgtable: add shortcuts for accessing kernel PMD and PTE") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Guenter Roeck <linux@roeck-us.net> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Mike Rapoport <rppt@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
@@ -264,7 +264,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma,
 #if defined(CONFIG_PPC_8xx)
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte)
 {
-	pmd_t *pmd = pmd_ptr(mm, addr);
+	pmd_t *pmd = pmd_off(mm, addr);
 	pte_basic_t val;
 	pte_basic_t *entry = &ptep->pte;
 	int num = is_hugepd(*((hugepd_t *)pmd)) ? 1 : SZ_512K / SZ_4K;

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma,`
`264`	`264`	`#if defined(CONFIG_PPC_8xx)`
`265`	`265`	`void set_huge_pte_at(struct mm_struct mm, unsigned long addr, pte_t ptep, pte_t pte)`
`266`	`266`	`{`
`267`		`- pmd_t *pmd = pmd_ptr(mm, addr);`
	`267`	`+ pmd_t *pmd = pmd_off(mm, addr);`
`268`	`268`	`pte_basic_t val;`
`269`	`269`	`pte_basic_t *entry = &ptep->pte;`
`270`	`270`	`int num = is_hugepd(((hugepd_t )pmd)) ? 1 : SZ_512K / SZ_4K;`