diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-24 14:15:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-24 14:15:51 -0400 |
| commit | a9aa4c5700c68c070d63a391b51ea8d341b6e8a6 (patch) | |
| tree | 974a824402b489cfec95f2ca8ec5bd9fef71a8bc /arch/arm/cpu/armv7/sunxi/psci.c | |
| parent | ef783259d6a558d31385039fa0def211fa7ad032 (diff) | |
| parent | e21e3ffdd18b88a12d98f6ae985fd5d334b9cec9 (diff) | |
Merge branch '2019-07-24-master-imports'
- Various Android related changes including A/B update and BCB updates
- Assorted minor fixes
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/psci.c')
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index f3e8f99a71..2c5d99e9ac 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -276,7 +276,7 @@ int __secure psci_cpu_on(u32 __always_unused unused, u32 mpidr, u32 pc, return ARM_PSCI_RET_SUCCESS; } -void __secure psci_cpu_off(void) +s32 __secure psci_cpu_off(void) { psci_cpu_off_common(); |