powerpc: Simplify strict_kernel_rwx_enabled()

chleroy · mcgrof · commit 79d9f965ecfd · 2024-02-02T10:21:25.000-08:00
Now that rodata_enabled is always declared, remove #ifdef
and define a single version of strict_kernel_rwx_enabled().

Signed-off-by: Christophe Leroy &lt;christophe.leroy@csgroup.eu&gt;
Signed-off-by: Luis Chamberlain &lt;mcgrof@kernel.org&gt;
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
@@ -330,17 +330,10 @@ static __always_inline bool early_radix_enabled(void)
 	return early_mmu_has_feature(MMU_FTR_TYPE_RADIX);
 }
 
-#ifdef CONFIG_STRICT_KERNEL_RWX
 static inline bool strict_kernel_rwx_enabled(void)
 {
-	return rodata_enabled;
+	return IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && rodata_enabled;
 }
-#else
-static inline bool strict_kernel_rwx_enabled(void)
-{
-	return false;
-}
-#endif
 
 static inline bool strict_module_rwx_enabled(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -330,17 +330,10 @@ static __always_inline bool early_radix_enabled(void)`
`330`	`330`	`return early_mmu_has_feature(MMU_FTR_TYPE_RADIX);`
`331`	`331`	`}`
`332`	`332`
`333`		`-#ifdef CONFIG_STRICT_KERNEL_RWX`
`334`	`333`	`static inline bool strict_kernel_rwx_enabled(void)`
`335`	`334`	`{`
`336`		`- return rodata_enabled;`
	`335`	`+ return IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && rodata_enabled;`
`337`	`336`	`}`
`338`		`-#else`
`339`		`-static inline bool strict_kernel_rwx_enabled(void)`
`340`		`-{`
`341`		`- return false;`
`342`		`-}`
`343`		`-#endif`
`344`	`337`
`345`	`338`	`static inline bool strict_module_rwx_enabled(void)`
`346`	`339`	`{`