Commit 5419447e authored Jun 13, 2016 by Michael Holzheu Committed by Martin Schwidefsky Jun 28, 2016

Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"



This reverts commit 852ffd0f.

There are use cases where an intermediate boot kernel (1) uses kexec
to boot the final production kernel (2). For this scenario we should
provide the original boot information to the production kernel (2).
Therefore clearing the boot information during kexec() should not
be done.

Cc: stable@vger.kernel.org # v3.17+
Reported-by: Steffen Maier <maier@linux.vnet.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent 02184c60

arch/s390/kernel/ipl.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -2064,12 +2064,5 @@ void s390_reset_system(void)
		S390_lowcore.program_new_psw.addr =
		(unsigned long) s390_base_pgm_handler;

		/*
		* Clear subchannel ID and number to signal new kernel that no CCW or
		* SCSI IPL has been done (for kexec and kdump)
		*/
		S390_lowcore.subchannel_id = 0;
		S390_lowcore.subchannel_nr = 0;

		do_reset_calls();
		}

Admin message