projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-hisi
/
hotplug.c
diff --git
a/arch/arm/mach-hisi/hotplug.c
b/arch/arm/mach-hisi/hotplug.c
index b909854eee7f7dff96479d520123a99cbc389c5a..abd441b0c60425a9b196a10bbcb181d4ebbaa09e 100644
(file)
--- 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)
: "cc");
}
+#ifdef CONFIG_HOTPLUG_CPU
void hi3xxx_cpu_die(unsigned int cpu)
{
cpu_enter_lowpower();
@@
-198,3
+199,4
@@
int hi3xxx_cpu_kill(unsigned int cpu)
hi3xxx_set_cpu(cpu, false);
return 1;
}
+#endif