diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-30 21:44:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-30 21:44:14 -0700 |
| commit | 0161b6e0d88e04f54ada7112bb2dad1f3ae472af (patch) | |
| tree | 54f3bdfdb74dc55a8165d0e46bff0ae65ebea123 /arch/s390/kernel/setup.c | |
| parent | 94521ca3dfa6efd4ceb4f6746bf8ead58afb1490 (diff) | |
| parent | 1af135a1e70ee6e31b5c265c769448984d221cf2 (diff) | |
| download | linux-0161b6e0d88e04f54ada7112bb2dad1f3ae472af.tar.gz linux-0161b6e0d88e04f54ada7112bb2dad1f3ae472af.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Martin Schwidefsky:
"There is one larger patch for the AP bus code to make it work with the
longer reset periods of the latest crypto cards.
A new default configuration, a naming cleanup for SMP and a few fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/kdump: fix compile for !SMP
s390/kdump: fix nosmt kernel parameter
s390: new default configuration
s390/smp: cleanup core vs. cpu in the SCLP interface
s390/smp: fix sigp cpu detection loop
s390/zcrypt: Fixed reset and interrupt handling of AP queues
s390/kdump: fix REGSET_VX_LOW vector register ELF notes
s390/bpf: Fix backward jumps
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 73941bf42350..f7f027caaaaa 100644 --- 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(); |