diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-04 00:09:14 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-06 00:36:22 +0200 |
| commit | fdeb94b5dc5bf9db7b3e36f3f38089a554f6a108 (patch) | |
| tree | 1cf3cfe5fa0a2a3faaa3ee9d13e9bb0277531c2e /arch/arm/kernel/psci_smp.c | |
| parent | Merge tag '3.10-rc2-psci-ops-11-tag' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-fdeb94b5dc5bf9db7b3e36f3f38089a554f6a108.tar.xz linux-fdeb94b5dc5bf9db7b3e36f3f38089a554f6a108.zip | |
ARM: 7745/1: psci: fix building without HOTPLUG_CPU
The cpu_die field in smp_operations is not valid with CONFIG_HOTPLUG_CPU,
so we must enclose it in #ifdef, but at least that lets us remove
two other lines.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/psci_smp.c')
| -rw-r--r-- | arch/arm/kernel/psci_smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c index 23a11424c568..219f1d73572a 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -68,8 +68,6 @@ void __ref psci_cpu_die(unsigned int cpu) /* We should never return */ panic("psci: cpu %d failed to shutdown\n", cpu); } -#else -#define psci_cpu_die NULL #endif bool __init psci_smp_available(void) @@ -80,5 +78,7 @@ bool __init psci_smp_available(void) struct smp_operations __initdata psci_smp_ops = { .smp_boot_secondary = psci_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU .cpu_die = psci_cpu_die, +#endif }; |