diff options
| author |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-03-22 08:22:02 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-03-22 08:22:02 +0100 |
| commit | bffc880b451f1e440efe1b8bd3af365018ec314a (patch) | |
| tree | 98e417649fdfc628ea3f035f45794823fac2ec3a /arch/s390/kernel/processor.c | |
| parent | s390/pkey: Fix wrong handling of secure key with old MKVP (diff) | |
| parent | s390: add a system call for guarded storage (diff) | |
| download | linux-dev-bffc880b451f1e440efe1b8bd3af365018ec314a.tar.xz linux-dev-bffc880b451f1e440efe1b8bd3af365018ec314a.zip | |
Merge branch 'guarded-storage' into 'features' to make merging with
the KVM tree easier.
Diffstat (limited to 'arch/s390/kernel/processor.c')
| -rw-r--r-- | arch/s390/kernel/processor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c index 928b929a6261..c73709869447 100644 --- a/arch/s390/kernel/processor.c +++ b/arch/s390/kernel/processor.c @@ -95,7 +95,7 @@ static void show_cpu_summary(struct seq_file *m, void *v) { static const char *hwcap_str[] = { "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", - "edat", "etf3eh", "highgprs", "te", "vx", "vxd", "vxe" + "edat", "etf3eh", "highgprs", "te", "vx", "vxd", "vxe", "gs" }; static const char * const int_hwcap_str[] = { "sie" |