aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/Kconfig
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2018-04-13 14:04:24 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-04-16 09:10:24 +0200
commit451239eb3d397bd197a79cc3aab943da41ba0905 (patch)
tree2cd29c9b20f9230f8d1bdb3103fc826d21c7b85f /arch/s390/Kconfig
parents390: remove couple of duplicate includes (diff)
downloadlinux-dev-451239eb3d397bd197a79cc3aab943da41ba0905.tar.xz
linux-dev-451239eb3d397bd197a79cc3aab943da41ba0905.zip
s390: add support for IBM z14 Model ZR1
Just add the new machine type number to the two places that matter. Cc: <stable@vger.kernel.org> # v4.14+ Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r--arch/s390/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index beccb58a82e5..199ac3e4da1d 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -286,12 +286,12 @@ config MARCH_Z13
older machines.
config MARCH_Z14
- bool "IBM z14"
+ bool "IBM z14 ZR1 and z14"
select HAVE_MARCH_Z14_FEATURES
help
- Select this to enable optimizations for IBM z14 (3906 series).
- The kernel will be slightly faster but will not work on older
- machines.
+ Select this to enable optimizations for IBM z14 ZR1 and z14 (3907
+ and 3906 series). The kernel will be slightly faster but will not
+ work on older machines.
endchoice