git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 67e108c)
ARM: hisi: fix building without CONFIG_HOTPLUG_CPU
authorArnd Bergmann <arnd@arndb.de>
Sat, 15 Mar 2014 10:47:14 +0000 (11:47 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Mar 2014 17:22:09 +0000 (18:22 +0100)
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>
arch/arm/mach-hisi/Makefile patch | blob | history
arch/arm/mach-hisi/hotplug.c patch | blob | history

diff --cc arch/arm/mach-hisi/Makefile
Simple merge
diff --cc arch/arm/mach-hisi/hotplug.c
Simple merge
Pandora Kernel Repository