2 files changed, 4 insertions, 1 deletions

diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index ace3bd315438..6f5167bc1928 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -75,6 +75,7 @@ struct sclp_info {
         unsigned char has_pfmfi : 1;
         unsigned char has_ibs : 1;
         unsigned char has_skey : 1;
+        unsigned char has_kss : 1;
         unsigned int ibc;
         unsigned int mtid;
         unsigned int mtid_cp;
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index 519ec1787117..efd84d1d178b 100644
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -40,7 +40,8 @@ struct read_info_sccb {
         u8      fac85;                  /* 85 */
         u8      _pad_86[91 - 86];       /* 86-90 */
         u8      flags;                  /* 91 */
-        u8      _pad_92[99 - 92];       /* 92-98 */
+        u8      _pad_92[98 - 92];       /* 92-97 */
+        u8      fac98;                  /* 98 */
         u8      hamaxpow;               /* 99 */
         u32     rnsize2;                /* 100-103 */
         u64     rnmax2;                 /* 104-111 */
@@ -99,6 +100,7 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb)
         sclp.has_pfmfi = !!(sccb->fac117 & 0x40);
         sclp.has_ibs = !!(sccb->fac117 & 0x20);
         sclp.has_hvs = !!(sccb->fac119 & 0x80);
+        sclp.has_kss = !!(sccb->fac98 & 0x01);
         if (sccb->fac85 & 0x02)
                 S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;
         sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;