From 4c9e0f76a55a38757390d43c40b2c7c3564a855a Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 23 May 2015 09:31:54 +0100 Subject: ARM: 8370/1: hisi: fix hip04 build without HOTPLUG_CPU The hip04 smp implementation provides the hotplug operations (cpu_die and cpu_kill) unconditionally at the moment, which leads to a build error when HOTPLUG_CPU is disabled: mach-hisi/platmcpm.c:242:13: note: (near initialization for 'hip04_smp_ops') mach-hisi/platmcpm.c:242:2: error: unknown field 'cpu_die' specified in initializer mach-hisi/platmcpm.c:243:2: error: unknown field 'cpu_kill' specified in initializer This uses an #ifdef to remove the code from the build when that option is not set. Fixes: 905cdf9dda5d ("ARM: hisi/hip04: remove the MCPM overhead") Signed-off-by: Arnd Bergmann Acked-by: Nicolas Pitre Acked-by: Wei Xu Signed-off-by: Russell King --- arch/arm/mach-hisi/platmcpm.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mach-hisi') diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c index 880cbfa9c343..b5f8f5ffda79 100644 --- a/arch/arm/mach-hisi/platmcpm.c +++ b/arch/arm/mach-hisi/platmcpm.c @@ -152,6 +152,7 @@ out: return 0; } +#ifdef CONFIG_HOTPLUG_CPU static void hip04_cpu_die(unsigned int l_cpu) { unsigned int mpidr, cpu, cluster; @@ -236,11 +237,14 @@ err: spin_unlock_irq(&boot_lock); return 0; } +#endif static struct smp_operations __initdata hip04_smp_ops = { .smp_boot_secondary = hip04_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU .cpu_die = hip04_cpu_die, .cpu_kill = hip04_cpu_kill, +#endif }; static bool __init hip04_cpu_table_init(void) -- cgit