aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/include/asm/kvm_host.h1
-rw-r--r--arch/s390/kvm/kvm-s390.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index a27f5007062a..4181d7baabba 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -110,6 +110,7 @@ struct kvm_s390_sie_block {
110#define ICTL_ISKE 0x00004000 110#define ICTL_ISKE 0x00004000
111#define ICTL_SSKE 0x00002000 111#define ICTL_SSKE 0x00002000
112#define ICTL_RRBE 0x00001000 112#define ICTL_RRBE 0x00001000
113#define ICTL_TPROT 0x00000200
113 __u32 ictl; /* 0x0048 */ 114 __u32 ictl; /* 0x0048 */
114 __u32 eca; /* 0x004c */ 115 __u32 eca; /* 0x004c */
115#define ICPT_INST 0x04 116#define ICPT_INST 0x04
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 06d1888f9179..43e191b25789 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -637,7 +637,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
637 if (sclp_has_siif()) 637 if (sclp_has_siif())
638 vcpu->arch.sie_block->eca |= 1; 638 vcpu->arch.sie_block->eca |= 1;
639 vcpu->arch.sie_block->fac = (int) (long) vfacilities; 639 vcpu->arch.sie_block->fac = (int) (long) vfacilities;
640 vcpu->arch.sie_block->ictl |= ICTL_ISKE | ICTL_SSKE | ICTL_RRBE; 640 vcpu->arch.sie_block->ictl |= ICTL_ISKE | ICTL_SSKE | ICTL_RRBE |
641 ICTL_TPROT;
642
641 if (kvm_s390_cmma_enabled(vcpu->kvm)) { 643 if (kvm_s390_cmma_enabled(vcpu->kvm)) {
642 rc = kvm_s390_vcpu_setup_cmma(vcpu); 644 rc = kvm_s390_vcpu_setup_cmma(vcpu);
643 if (rc) 645 if (rc)