s390: add z13s model number to z13 elf platform

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 3be9c832dec117a041378bd606f07df89ca44520..683af90efe86d83aebfd96ab38df0577310c04a4 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -254,12 +254,12 @@ config MARCH_ZEC12
          older machines.
 
 config MARCH_Z13
-       bool "IBM z13"
+       bool "IBM z13s and z13"
        select HAVE_MARCH_Z13_FEATURES
        help
-         Select this to enable optimizations for IBM z13 (2964 series).
-         The kernel will be slightly faster but will not work on older
-         machines.
+         Select this to enable optimizations for IBM z13s and z13 (2965 and
+         2964 series). The kernel will be slightly faster but will not work on
+         older machines.
 
 endchoice
 

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 9220db5c996aa5250ca4d904361c51cec33d7827..b1fbcc07c8710a60f3e3f6b7fe8798e5740b7997 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -779,6 +779,7 @@ static int __init setup_hwcaps(void)
                strcpy(elf_platform, "zEC12");
                break;
        case 0x2964:
+       case 0x2965:
                strcpy(elf_platform, "z13");
                break;
        }