ARM: 7745/1: psci: fix building without HOTPLUG_CPU
authorArnd Bergmann <arnd@arndb.de>
Mon, 3 Jun 2013 22:09:14 +0000 (23:09 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 23 Oct 2014 19:07:27 +0000 (20:07 +0100)
commit9224f461847062111eca24ea7fb9062f1ae0d8fc
treea99252a23788f98fd8e46ffecb4bbe3c6ce640fd
parent0701a48d8b0353fc7338e20c1b14b00e7cae7b1f
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>
(cherry picked from commit fdeb94b5dc5bf9db7b3e36f3f38089a554f6a108)
Signed-off-by: Mark Brown <broonie@kernel.org>
arch/arm/kernel/psci_smp.c