[PATCH 05/18] ARM: SCMI: Use correct smc/hvc instructions on ARM64

[Sascha Hauer]

We don't have a CONFIG_ARM64 symbol, so we'll always select the ARM32
smc/hvc variants. Use the correct CONFIG_CPU_64 to fix that.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 include/linux/arm-smccc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index 64ee3863a6..f6942c6420 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -286,12 +286,12 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
 #define arm_smccc_hvc_quirk(...) __arm_smccc_hvc(__VA_ARGS__)
 
 /* SMCCC v1.1 implementation madness follows */
-#ifdef CONFIG_ARM64
+#ifdef CONFIG_CPU_64
 
 #define SMCCC_SMC_INST	"smc	#0"
 #define SMCCC_HVC_INST	"hvc	#0"
 
-#elif defined(CONFIG_ARM)
+#elif defined(CONFIG_CPU_32)
 #include <asm/opcodes-sec.h>
 #include <asm/opcodes-virt.h>
 
-- 
2.39.2