summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorVijaya Kumar K <vijay.kilari@gmail.com>2013-08-14 13:28:28 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-25 08:27:11 -0800
commit36a2e5010fe877bc2f049682d3b9ede4357a3927 (patch)
tree03d71a3a98287ad752435934528b5f35267073e2 /arch
parent1071ea6e68ead40df739b223e9013d99c23c19ab (diff)
downloadlinux-3.10-36a2e5010fe877bc2f049682d3b9ede4357a3927.tar.gz
linux-3.10-36a2e5010fe877bc2f049682d3b9ede4357a3927.tar.bz2
linux-3.10-36a2e5010fe877bc2f049682d3b9ede4357a3927.zip
ARM: 7815/1: kexec: offline non panic CPUs on Kdump panic
commit 4f9b4fb7a2091eec339413a460b1665758401828 upstream. In case of normal kexec kernel load, all cpu's are offlined before calling machine_kexec().But in case crash panic cpus are relaxed in machine_crash_nonpanic_core() SMP function but not offlined. When crash kernel is loaded with kexec and on panic trigger machine_kexec() checks for number of cpus online. If more than one cpu is online machine_kexec() fails to load with below error kexec: error: multiple CPUs still online In machine_crash_nonpanic_core() SMP function, offline CPU before cpu_relax Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@caviumnetworks.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: l00221744 <sdu.liu@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/machine_kexec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index 4fb074c446b..163b160c69e 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -73,6 +73,7 @@ void machine_crash_nonpanic_core(void *unused)
crash_save_cpu(&regs, smp_processor_id());
flush_cache_all();
+ set_cpu_online(smp_processor_id(), false);
atomic_dec(&waiting_for_crash_ipi);
while (1)
cpu_relax();