ARM: 8370/1: hisi: fix hip04 build without HOTPLUG_CPU
authorArnd Bergmann <arnd@arndb.de>
Sat, 23 May 2015 08:31:54 +0000 (09:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 May 2015 23:22:49 +0000 (00:22 +0100)
commit4c9e0f76a55a38757390d43c40b2c7c3564a855a
treef55f938c647b400d5e8a19445aa9ee7b59b1fe2d
parent7895f73169ade9a74940ae6b0b4ee82faf286861
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 <arnd@arndb.de>
Acked-by: Nicolas Pitre <nico@xxxxxxxxxx>
Acked-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-hisi/platmcpm.c