diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2014-05-27 11:18:17 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-27 15:58:49 +0200 |
| commit | d6d7a95c1bdba370e2249efdecfab712c10cfc9b (patch) | |
| tree | 8f2ebdaf79d503358d0bb2ef75244380a8a9192c | |
| parent | 04092204bb66c4f8e17465eeee64357dd2ad2585 (diff) | |
| download | op-kernel-dev-d6d7a95c1bdba370e2249efdecfab712c10cfc9b.zip op-kernel-dev-d6d7a95c1bdba370e2249efdecfab712c10cfc9b.tar.gz | |
arm: Fix compile warning for psci
Commit e71246a23acbc89e9cb4ebf1558d60e65733479f changes psci_init from a
function returning a void to an int, but does not change the non
CONFIG_ARM_PSCI implementation to return a value, which causes a compile
warning. Just return 0.
Cc: Ashwin Chaugule <ashwin.chaugule@linaro.org>
Cc: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch/arm/include/asm/psci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index b93e34a9..c25ef3e 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -41,7 +41,7 @@ extern struct smp_operations psci_smp_ops; int psci_init(void); bool psci_smp_available(void); #else -static inline int psci_init(void) { } +static inline int psci_init(void) { return 0; } static inline bool psci_smp_available(void) { return false; } #endif |
