aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/Kconfig8
-rw-r--r--arch/s390/kernel/setup.c1
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 3be9c832dec1..683af90efe86 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -254,12 +254,12 @@ config MARCH_ZEC12
254 older machines. 254 older machines.
255 255
256config MARCH_Z13 256config MARCH_Z13
257 bool "IBM z13" 257 bool "IBM z13s and z13"
258 select HAVE_MARCH_Z13_FEATURES 258 select HAVE_MARCH_Z13_FEATURES
259 help 259 help
260 Select this to enable optimizations for IBM z13 (2964 series). 260 Select this to enable optimizations for IBM z13s and z13 (2965 and
261 The kernel will be slightly faster but will not work on older 261 2964 series). The kernel will be slightly faster but will not work on
262 machines. 262 older machines.
263 263
264endchoice 264endchoice
265 265
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 9220db5c996a..b1fbcc07c871 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -779,6 +779,7 @@ static int __init setup_hwcaps(void)
779 strcpy(elf_platform, "zEC12"); 779 strcpy(elf_platform, "zEC12");
780 break; 780 break;
781 case 0x2964: 781 case 0x2964:
782 case 0x2965:
782 strcpy(elf_platform, "z13"); 783 strcpy(elf_platform, "z13");
783 break; 784 break;
784 } 785 }