projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-2.6-block.git]
/
arch
/
s390
/
kernel
/
setup.c
diff --git
a/arch/s390/kernel/setup.c
b/arch/s390/kernel/setup.c
index 73941bf4235088a5bd576b63bebac4076bbd42bf..f7f027caaaaacb33b279f76b33f3525374b6ae34 100644
(file)
--- a/
arch/s390/kernel/setup.c
+++ b/
arch/s390/kernel/setup.c
@@
-868,6
+868,11
@@
void __init setup_arch(char **cmdline_p)
check_initrd();
reserve_crashkernel();
+ /*
+ * Be aware that smp_save_dump_cpus() triggers a system reset.
+ * Therefore CPU and device initialization should be done afterwards.
+ */
+ smp_save_dump_cpus();
setup_resources();
setup_vmcoreinfo();