diff options
author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2016-04-13 06:09:58 -0400 |
---|---|---|
committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2016-06-10 06:07:29 -0400 |
commit | 9a68f0af8cd907452fa6c33343d38cdacff96294 (patch) | |
tree | 1563e6aca10c5d703e0c91d14f071e95f5e25224 /arch/s390/kvm | |
parent | 6164a2e90a5b6c5c32ccfe7a1baff80d603d702d (diff) |
KVM: s390: pfmf: MR and MC are ignored without CSSKE
These two bits are simply ignored when the conditional-SSKE facility is
not installed.
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r-- | arch/s390/kvm/priv.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index bfba98302ca0..5c926b74d7ca 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c | |||
@@ -675,10 +675,6 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) | |||
675 | !test_kvm_facility(vcpu->kvm, 14)) | 675 | !test_kvm_facility(vcpu->kvm, 14)) |
676 | return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); | 676 | return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); |
677 | 677 | ||
678 | /* No support for conditional-SSKE */ | ||
679 | if (vcpu->run->s.regs.gprs[reg1] & (PFMF_MR | PFMF_MC)) | ||
680 | return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); | ||
681 | |||
682 | start = vcpu->run->s.regs.gprs[reg2] & PAGE_MASK; | 678 | start = vcpu->run->s.regs.gprs[reg2] & PAGE_MASK; |
683 | start = kvm_s390_logical_to_effective(vcpu, start); | 679 | start = kvm_s390_logical_to_effective(vcpu, start); |
684 | 680 | ||