Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>
Mon, 13 Jun 2016 15:03:48 +0000 (17:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Jul 2016 15:42:24 +0000 (08:42 -0700)
commitcda1a747e63ad7c3c7f549f10526311e33b85e9b
treebeabf56dd51d8d7514e7824f5a21ada3ddcee54b
parent08d3eff690dcbdc4f27a212eb2b9578b8b579b11
Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"

commit 5419447e2142d6ed68c9f5c1a28630b3a290a845 upstream.

This reverts commit 852ffd0f4e23248b47531058e531066a988434b5.

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.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/s390/kernel/ipl.c