book3s64/radix: Fix compile errors when CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=n

riteshharjani · jfvogel · commit 856076411ecb · 2025-06-03T13:30:11.000-07:00
[ Upstream commit 29bdc1f ] Fix compile errors when CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=n Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Signed-off-by: Donet Tom <donettom@linux.ibm.com> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/8231763344223c193e3452eab0ae8ea966aff466.1741609795.git.donettom@linux.ibm.com Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 5863bd44ed2fa27c6bb7b3f2b7bf9450b67e02d2) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c
@@ -988,14 +988,15 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,
 	return 0;
 }
 
-
+#ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP
 bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap)
 {
 	if (radix_enabled())
 		return __vmemmap_can_optimize(altmap, pgmap);
 
 	return false;
 }
+#endif
 
 int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,
 				unsigned long addr, unsigned long next)

Original file line number	Diff line number	Diff line change
`@@ -988,14 +988,15 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,`
`988`	`988`	`return 0;`
`989`	`989`	`}`
`990`	`990`
`991`		`-`
	`991`	`+#ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP`
`992`	`992`	`bool vmemmap_can_optimize(struct vmem_altmap altmap, struct dev_pagemap pgmap)`
`993`	`993`	`{`
`994`	`994`	`if (radix_enabled())`
`995`	`995`	`return __vmemmap_can_optimize(altmap, pgmap);`
`996`	`996`
`997`	`997`	`return false;`
`998`	`998`	`}`
	`999`	`+#endif`
`999`	`1000`
`1000`	`1001`	`int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,`
`1001`	`1002`	`unsigned long addr, unsigned long next)`