Commit 451239eb authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f43c426a
...@@ -286,12 +286,12 @@ config MARCH_Z13 ...@@ -286,12 +286,12 @@ config MARCH_Z13
older machines. older machines.
config MARCH_Z14 config MARCH_Z14
bool "IBM z14" bool "IBM z14 ZR1 and z14"
select HAVE_MARCH_Z14_FEATURES select HAVE_MARCH_Z14_FEATURES
help help
Select this to enable optimizations for IBM z14 (3906 series). Select this to enable optimizations for IBM z14 ZR1 and z14 (3907
The kernel will be slightly faster but will not work on older and 3906 series). The kernel will be slightly faster but will not
machines. work on older machines.
endchoice endchoice
......
...@@ -583,6 +583,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void) ...@@ -583,6 +583,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void)
model = cpumcf_z13_pmu_event_attr; model = cpumcf_z13_pmu_event_attr;
break; break;
case 0x3906: case 0x3906:
case 0x3907:
model = cpumcf_z14_pmu_event_attr; model = cpumcf_z14_pmu_event_attr;
break; break;
default: default:
......
...@@ -821,6 +821,7 @@ static int __init setup_hwcaps(void) ...@@ -821,6 +821,7 @@ static int __init setup_hwcaps(void)
strcpy(elf_platform, "z13"); strcpy(elf_platform, "z13");
break; break;
case 0x3906: case 0x3906:
case 0x3907:
strcpy(elf_platform, "z14"); strcpy(elf_platform, "z14");
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment