]> git.itanic.dy.fi Git - linux-stable/commit
s390/early: improve machine detection
authorChristian Borntraeger <borntraeger@de.ibm.com>
Fri, 9 Nov 2018 08:21:47 +0000 (09:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Feb 2019 18:43:03 +0000 (19:43 +0100)
commit74be2fcda651e596fe4e96c3c1ae4d76aa683655
tree9b6f42a51093cd2e4e996737459c30cdbb2e2b03
parentc25a126d1a651a07dcdddc8f8eb3ef8c01fec932
s390/early: improve machine detection

commit 03aa047ef2db4985e444af6ee1c1dd084ad9fb4c upstream.

Right now the early machine detection code check stsi 3.2.2 for "KVM"
and set MACHINE_IS_VM if this is different. As the console detection
uses diagnose 8 if MACHINE_IS_VM returns true this will crash Linux
early for any non z/VM system that sets a different value than KVM.
So instead of assuming z/VM, do not set any of MACHINE_IS_LPAR,
MACHINE_IS_VM, or MACHINE_IS_KVM.

CC: stable@vger.kernel.org
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/s390/kernel/early.c
arch/s390/kernel/setup.c