diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-04-12 14:17:25 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-07-26 08:25:15 +0200 |
| commit | 6997c32365ac5a61b298a9e165ed32497c8cbc25 (patch) | |
| tree | 8d68e1b14fbf9c957fc51a765955a6af7a681405 /arch/s390/kernel/setup.c | |
| parent | 6e2ef5e4f6cc57344762932d70d38ba4ec65fa8b (diff) | |
| download | linux-6997c32365ac5a61b298a9e165ed32497c8cbc25.tar.gz | |
s390: add support for IBM z14 machines
Add detection for machine type 0x3906 and set the ELF platform name to z14. Add the miscellaneous-instruction-extension 2 facility to the list of facilities for z14. And allow to generate code that only runs on a z14 machine. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index e8b84894b650..a50238e17867 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -818,6 +818,9 @@ static int __init setup_hwcaps(void) case 0x2965: strcpy(elf_platform, "z13"); break; + case 0x3906: + strcpy(elf_platform, "z14"); + break; } /* |