| Message ID | 1491458834-28498-1-git-send-email-amit.pundir@linaro.org |
|---|---|
| State | New |
| Headers | show |
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index e3789fb..c25ef3e 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -37,7 +37,7 @@ struct psci_operations { extern struct psci_operations psci_ops; extern struct smp_operations psci_smp_ops; -#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI) +#ifdef CONFIG_ARM_PSCI int psci_init(void); bool psci_smp_available(void); #else
This reverts commit dbcfee724255ae171af51aaa56d8c5b78342adc9. Upstream commit be95485 (ARM: 8457/1: psci-smp is built only for SMP) was intended to fix the build error for configs with CONFIG_SMP=n and CONFIG_ARM_PSCI=y, but it end up introducing a build error when cherry-picked on 3.18.y. This patch resulted in redefinition of psci_init() and broke the build for every build config in 3.18.y with CONFIG_SMP=n and CONFIG_ARM_PSCI=y. Signed-off-by: Amit Pundir <amit.pundir@linaro.org> --- arch/arm/include/asm/psci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4