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)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 11 Jul 2016 02:27:13 +0000 (22:27 -0400)
commit2bbd6a57310cd7dd8fd4c484e629bb5389b78d9b
tree940ff2c3ec1ac1e69757048800d951d475b5461b
parent49cacd2b68d3dfc88bbf5cf16c885138ba947561
Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"

[ Upstream commit 5419447e2142d6ed68c9f5c1a28630b3a290a845 ]

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.

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
arch/s390/kernel/ipl.c