fix merge "mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t *"

scpcom · scpcom · commit 4648bf73ed63 · 2023-09-30T17:33:33.000+02:00
diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
@@ -62,7 +62,7 @@ static inline void pud_clear(pud_t *pudp)
 
 static inline pmd_t *pud_pgtable(pud_t pud)
 {
-	return (unsigned long)pfn_to_virt((pud_val(pud) & _PAGE_CHG_MASK) >> _PAGE_PFN_SHIFT);
+	return (pmd_t *)pfn_to_virt((pud_val(pud) & _PAGE_CHG_MASK) >> _PAGE_PFN_SHIFT);
 }
 
 static inline struct page *pud_page(pud_t pud)

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static inline void pud_clear(pud_t *pudp)`
`62`	`62`
`63`	`63`	`static inline pmd_t *pud_pgtable(pud_t pud)`
`64`	`64`	`{`
`65`		`- return (unsigned long)pfn_to_virt((pud_val(pud) & _PAGE_CHG_MASK) >> _PAGE_PFN_SHIFT);`
	`65`	`+ return (pmd_t *)pfn_to_virt((pud_val(pud) & _PAGE_CHG_MASK) >> _PAGE_PFN_SHIFT);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`static inline struct page *pud_page(pud_t pud)`