diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-13 13:42:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-13 13:42:37 +0200 |
| commit | 6165de1c087e15de83728c645e0c5cd47d43f671 (patch) | |
| tree | 0398b9edb042ad2d2aa0ab2c98067fe317c430b0 /arch/arm/cpu | |
| parent | c5c08624f73a0b7e8f822127b256b19ff1b6f553 (diff) | |
| download | barebox-6165de1c087e15de83728c645e0c5cd47d43f671.tar.gz barebox-6165de1c087e15de83728c645e0c5cd47d43f671.tar.xz | |
ARM: unify asm/arm-smccc.h and linux/arm-smccc.h
Since 2c20674f0c ("ARM: Add code to support SMCCC on AArch64") we have
both arch/arm/include/asm/arm-smccc.h and include/linux/arm-smccc.h.
The latter was introduced with Kernel commit 680a0873e ("arm: kernel:
Add SMC structure parameter") included, so we have to add the parameter
for ARM32 aswell.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/psci.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/sm.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/smccc-call.S | 18 |
3 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/cpu/psci.c b/arch/arm/cpu/psci.c index c4c8c64cbe..3a1abd1421 100644 --- a/arch/arm/cpu/psci.c +++ b/arch/arm/cpu/psci.c @@ -13,7 +13,7 @@ #include <common.h> #include <asm/psci.h> -#include <asm/arm-smccc.h> +#include <linux/arm-smccc.h> #include <asm/secure.h> #include <asm/system.h> #include <restart.h> diff --git a/arch/arm/cpu/sm.c b/arch/arm/cpu/sm.c index 633c9e8c83..d9d62fbd9d 100644 --- a/arch/arm/cpu/sm.c +++ b/arch/arm/cpu/sm.c @@ -16,7 +16,7 @@ #include <asm/system.h> #include <init.h> #include <globalvar.h> -#include <asm/arm-smccc.h> +#include <linux/arm-smccc.h> #include <asm-generic/sections.h> #include <asm/secure.h> diff --git a/arch/arm/cpu/smccc-call.S b/arch/arm/cpu/smccc-call.S index c2781b1ab2..b6bdc8b3b5 100644 --- a/arch/arm/cpu/smccc-call.S +++ b/arch/arm/cpu/smccc-call.S @@ -46,19 +46,21 @@ UNWIND( .fnend) .endm /* - * void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2, + * void __smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_smc) +ENTRY(__arm_smccc_smc) SMCCC SMCCC_SMC -ENDPROC(arm_smccc_smc) +ENDPROC(__arm_smccc_smc) /* - * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, + * void __smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_hvc) +ENTRY(__arm_smccc_hvc) SMCCC SMCCC_HVC -ENDPROC(arm_smccc_hvc) +ENDPROC(__arm_smccc_hvc) |