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

diff --combined arch/s390/kernel/setup.c
index 73941bf4235088a5bd576b63bebac4076bbd42bf,ca070d260af2e166b23b48553b2b6c02dc2a1046..f7f027caaaaacb33b279f76b33f3525374b6ae34
--- 1/arch/s390/kernel/setup.c
--- 2/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@@ -868,6 -868,11 +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();
@@@ -880,8 -885,6 +885,8 @@@
         */
        setup_hwcaps();
  
 +      HPAGE_SHIFT = MACHINE_HAS_HPAGE ? 20 : 0;
 +
        /*
         * Create kernel page tables and switch to virtual addressing.
         */