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/mach-imx/mx7/psci-mx7.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/mach-imx/mx7/psci-mx7.c')
| -rw-r--r-- | arch/arm/mach-imx/mx7/psci-mx7.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c index 34ba0a9307d..c98d2e96af5 100644 --- a/arch/arm/mach-imx/mx7/psci-mx7.c +++ b/arch/arm/mach-imx/mx7/psci-mx7.c @@ -298,7 +298,7 @@ __secure s32 psci_affinity_info(u32 __always_unused function_id, return psci_state[cpu]; } -__secure s32 psci_migrate_info_type(u32 function_id) +__secure u32 psci_migrate_info_type(void) { /* Trusted OS is either not present or does not require migration */ return 2; |