diff options
| author |   Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-12-09 11:48:36 +0000 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2014-12-11 12:08:06 +0000 |
| commit | e5e62d475274a060803cd2c57996a7ebc97f3e60 (patch) | |
| tree | ce399ea7dfcce9970453a6f4f4716875597942d8 /arch/arm64/kernel/psci.c | |
| parent | arm64: remove the unnecessary arm64_swiotlb_init() (diff) | |
| download | linux-dev-e5e62d475274a060803cd2c57996a7ebc97f3e60.tar.xz linux-dev-e5e62d475274a060803cd2c57996a7ebc97f3e60.zip | |
arm64: psci: Fix build breakage without PM_SLEEP
Fix build failure of defconfig when PM_SLEEP is disabled (e.g. by
disabling SUSPEND) and CPU_IDLE enabled:
arch/arm64/kernel/psci.c:543:2: error: unknown field ‘cpu_suspend’ specified in initializer
.cpu_suspend = cpu_psci_cpu_suspend,
^
arch/arm64/kernel/psci.c:543:2: warning: initialization from incompatible pointer type [enabled by default]
arch/arm64/kernel/psci.c:543:2: warning: (near initialization for ‘cpu_psci_ops.cpu_prepare’) [enabled by default]
make[1]: *** [arch/arm64/kernel/psci.o] Error 1
The cpu_operations.cpu_suspend field exists only if ARM64_CPU_SUSPEND is
defined, not CPU_IDLE.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/psci.c')
| -rw-r--r-- | arch/arm64/kernel/psci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 866c1c821860..b38c82791f80 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -540,6 +540,8 @@ const struct cpu_operations cpu_psci_ops = { .name = "psci", #ifdef CONFIG_CPU_IDLE .cpu_init_idle = cpu_psci_cpu_init_idle, +#endif +#ifdef CONFIG_ARM64_CPU_SUSPEND .cpu_suspend = cpu_psci_cpu_suspend, #endif #ifdef CONFIG_SMP |