diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-01-30 17:42:40 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-01-30 17:42:40 +0100 |
| commit | 92ea2b3381d7dc4223375f4337dcadb1fd556576 (patch) | |
| tree | ad403262229ec273bad951fd3e6ace01235927de /drivers | |
| parent | KVM: VMX: introduce X2APIC_MSR macro (diff) | |
| parent | KVM: s390: introduce the format-1 GISA (diff) | |
| download | linux-92ea2b3381d7dc4223375f4337dcadb1fd556576.tar.xz linux-92ea2b3381d7dc4223375f4337dcadb1fd556576.zip | |
Merge tag 'kvm-s390-next-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: Fixes and features for 4.16 part 2
- exitless interrupts for emulated devices (Michael Mueller)
- cleanup of cpuflag handling (David Hildenbrand)
- kvm stat counter improvements (Christian Borntraeger)
- vsie improvements (David Hildenbrand)
- mm cleanup (Janosch Frank)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/char/sclp_early.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c index d06bc5674e5f..6b1891539c84 100644 --- a/drivers/s390/char/sclp_early.c +++ b/drivers/s390/char/sclp_early.c @@ -49,7 +49,7 @@ struct read_info_sccb { u8 _pad_112[116 - 112]; /* 112-115 */ u8 fac116; /* 116 */ u8 fac117; /* 117 */ - u8 _pad_118; /* 118 */ + u8 fac118; /* 118 */ u8 fac119; /* 119 */ u16 hcpua; /* 120-121 */ u8 _pad_122[124 - 122]; /* 122-123 */ @@ -100,6 +100,7 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb) sclp.has_esca = !!(sccb->fac116 & 0x08); sclp.has_pfmfi = !!(sccb->fac117 & 0x40); sclp.has_ibs = !!(sccb->fac117 & 0x20); + sclp.has_gisaf = !!(sccb->fac118 & 0x08); sclp.has_hvs = !!(sccb->fac119 & 0x80); sclp.has_kss = !!(sccb->fac98 & 0x01); if (sccb->fac85 & 0x02) |