diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2013-09-02 19:49:03 +0800 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-25 14:03:16 +0100 |
| commit | e296b46413b5f4e0eb3fa458f274f409e2f3d9e1 (patch) | |
| tree | 41f72c9dcdf45a81cf6e02d89b0937809deaa4e2 /arch/arm64 | |
| parent | a072e7ec348b85e8ab826434f895202ca7e4f172 (diff) | |
Revert "ARM64 / CPU hot-plug: Skeleton logic cpu online/offline for cpu hot-plug"
This reverts commit b527efad22647cce76bf555252ae1574ea364529.
Since Mark Rutland implmented cpu online/offline on ARM64, this
commit should be reverted and apply Mark's patch set instead.
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm64/include/asm/smp.h | 3 | ||||
| -rw-r--r-- | arch/arm64/kernel/smp.c | 21 |
3 files changed, 0 insertions, 31 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4cbcc7e180da..7ae8c8f905a5 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -185,13 +185,6 @@ config NR_CPUS default "8" if ARCH_XGENE default "4" -config HOTPLUG_CPU - bool "Support for hot-pluggable CPUs" - depends on SMP && HOTPLUG - help - Say Y here to experiment with turning CPUs off and on. CPUs - can be controlled through /sys/devices/system/cpu. - source kernel/Kconfig.preempt config HZ diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h index 95c9f5865000..4b8023c5d146 100644 --- a/arch/arm64/include/asm/smp.h +++ b/arch/arm64/include/asm/smp.h @@ -63,9 +63,6 @@ extern struct secondary_data secondary_data; extern void secondary_holding_pen(void); extern volatile unsigned long secondary_holding_pen_release; -extern int __cpu_disable(void); -extern void __cpu_die(unsigned int cpu); - extern void arch_send_call_function_single_ipi(int cpu); extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 6e6dbf292617..5457e684bce1 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -257,27 +257,6 @@ static const struct smp_enable_ops * __init smp_get_enable_ops(const char *name) return NULL; } -#ifdef CONFIG_HOTPLUG_CPU -/* - * __cpu_disable runs on the processor to be shutdown. - */ -int __cpuinit __cpu_disable(void) -{ - pr_info("entered __cpu_disable(), assume always success\n"); - return 0; -} - -/* - * called on the thread which is asking for a CPU to be shutdown - - * waits until shutdown has completed, or it is timed out. - */ -void __cpuinit __cpu_die(unsigned int cpu) -{ - pr_info("entered __cpu_disable(), cpu %d will go away\n", cpu); - return; -} -#endif /* CONFIG_HOTPLUG_CPU */ - /* * Enumerate the possible CPU set from the device tree and build the * cpu logical map array containing MPIDR values related to logical |