From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jul 2015 04:44:14 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v4.2-rc1~62
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/0161b6e0d88e04f54ada7112bb2dad1f3ae472af?hp=-c

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
---

0161b6e0d88e04f54ada7112bb2dad1f3ae472af
diff --combined arch/s390/kernel/setup.c
index 73941bf42350,ca070d260af2..f7f027caaaaa
--- a/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.
  	 */