[PATCH v5 06/23] powerpc/book3s64/kup: Use the correct #ifdef when including headers
From: Aneesh Kumar K.V <hidden>
Date: 2020-08-27 04:22:21
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
Use CONFIG_PPC_BOOK3S_64 instead of CONFIG_PPC64. This avoid wrong inclusion with other 64bit platforms. To fix booke 64 build error add macro kuap_check_amr. Signed-off-by: Aneesh Kumar K.V <redacted> --- arch/powerpc/include/asm/kup.h | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index 1cff92953384..6c3ee976ee15 100644
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h@@ -15,8 +15,16 @@ #define KUAP_CURRENT (KUAP_CURRENT_READ | KUAP_CURRENT_WRITE) #ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC_BOOK3S_64 #include <asm/book3s/64/kup.h> +#else +#ifdef __ASSEMBLY__ +.macro kuap_check_amr gpr1, gpr2 +.endm #endif +#endif +#endif /* CONFIG_PPC_64 */ + #ifdef CONFIG_PPC_8xx #include <asm/nohash/32/kup-8xx.h> #endif
--
2.26.2