sparc32: Add pmd_pfn()

Matthew Wilcox (Oracle) · Matthew Wilcox (Oracle) · commit aef13dec0a5f · 2022-03-21T12:59:02.000-04:00
We need to use this function in common code; pull it out of pmd_page().

Signed-off-by: Matthew Wilcox (Oracle) &lt;willy@infradead.org&gt;
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
@@ -127,11 +127,16 @@ static inline int srmmu_device_memory(unsigned long x)
 	return ((x & 0xF0000000) != 0);
 }
 
+static inline unsigned long pmd_pfn(pmd_t pmd)
+{
+	return (pmd_val(pmd) & SRMMU_PTD_PMASK) >> (PAGE_SHIFT-4);
+}
+
 static inline struct page *pmd_page(pmd_t pmd)
 {
 	if (srmmu_device_memory(pmd_val(pmd)))
 		BUG();
-	return pfn_to_page((pmd_val(pmd) & SRMMU_PTD_PMASK) >> (PAGE_SHIFT-4));
+	return pfn_to_page(pmd_pfn(pmd));
 }
 
 static inline unsigned long __pmd_page(pmd_t pmd)

Original file line number	Diff line number	Diff line change
`@@ -127,11 +127,16 @@ static inline int srmmu_device_memory(unsigned long x)`
`127`	`127`	`return ((x & 0xF0000000) != 0);`
`128`	`128`	`}`
`129`	`129`
	`130`	`+static inline unsigned long pmd_pfn(pmd_t pmd)`
	`131`	`+{`
	`132`	`+ return (pmd_val(pmd) & SRMMU_PTD_PMASK) >> (PAGE_SHIFT-4);`
	`133`	`+}`
	`134`	`+`
`130`	`135`	`static inline struct page *pmd_page(pmd_t pmd)`
`131`	`136`	`{`
`132`	`137`	`if (srmmu_device_memory(pmd_val(pmd)))`
`133`	`138`	`BUG();`
`134`		`- return pfn_to_page((pmd_val(pmd) & SRMMU_PTD_PMASK) >> (PAGE_SHIFT-4));`
	`139`	`+ return pfn_to_page(pmd_pfn(pmd));`
`135`	`140`	`}`
`136`	`141`
`137`	`142`	`static inline unsigned long __pmd_page(pmd_t pmd)`