Commit fdeb94b5 authored Jun 03, 2013 by Arnd Bergmann Committed by Russell King Jun 05, 2013

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>

parent 78ecad01

arch/arm/kernel/psci_smp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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
		};