git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: 7759/1: decouple CPU offlining from reboot/shutdown
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
machine_kexec.c
diff --git
a/arch/arm/kernel/machine_kexec.c
b/arch/arm/kernel/machine_kexec.c
index 8ef8c9337809cbe5ccb91b33525c38a379e9e986..4fb074c446bf901df288b3878341a169dacb843b 100644
(file)
--- a/
arch/arm/kernel/machine_kexec.c
+++ b/
arch/arm/kernel/machine_kexec.c
@@
-134,6
+134,10
@@
void machine_kexec(struct kimage *image)
unsigned long reboot_code_buffer_phys;
void *reboot_code_buffer;
+ if (num_online_cpus() > 1) {
+ pr_err("kexec: error: multiple CPUs still online\n");
+ return;
+ }
page_list = image->head & PAGE_MASK;