aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-hisi/hotplug.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-15 06:47:14 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-21 13:22:09 -0400
commit1d858f3177eee9dcf7e0a4a933d5269db7875098 (patch)
treeed51fedfc3dd045401ef2f88918f0fddfee0e3db /arch/arm/mach-hisi/hotplug.c
parent67e108c530c77cf6b939907536f2ceda3b196dd6 (diff)
ARM: hisi: fix building without CONFIG_HOTPLUG_CPU
The hisi SMP code always uses the hi3xxx_set_cpu() function defined in the hotplug.c file, so we cannot build without this when CONFIG_SMP is enabled. This patch slightly restructures the code so we always build the parts of hotplug.c that we need but just leave out the CPU disable logic if CONFIG_HOTPLUG_CPU is turned off. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-hisi/hotplug.c')
-rw-r--r--arch/arm/mach-hisi/hotplug.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
index b909854eee7f..abd441b0c604 100644
--- a/arch/arm/mach-hisi/hotplug.c
+++ b/arch/arm/mach-hisi/hotplug.c
@@ -178,6 +178,7 @@ static inline void cpu_enter_lowpower(void)
178 : "cc"); 178 : "cc");
179} 179}
180 180
181#ifdef CONFIG_HOTPLUG_CPU
181void hi3xxx_cpu_die(unsigned int cpu) 182void hi3xxx_cpu_die(unsigned int cpu)
182{ 183{
183 cpu_enter_lowpower(); 184 cpu_enter_lowpower();
@@ -198,3 +199,4 @@ int hi3xxx_cpu_kill(unsigned int cpu)
198 hi3xxx_set_cpu(cpu, false); 199 hi3xxx_set_cpu(cpu, false);
199 return 1; 200 return 1;
200} 201}
202#endif