aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/emulate.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kvm/emulate.c')
-rw-r--r--arch/arm/kvm/emulate.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kvm/emulate.c b/arch/arm/kvm/emulate.c
index af93e3ffc9f3..eda9ddd03e7c 100644
--- a/arch/arm/kvm/emulate.c
+++ b/arch/arm/kvm/emulate.c
@@ -221,9 +221,7 @@ static void kvm_adjust_itstate(struct kvm_vcpu *vcpu)
221 unsigned long cpsr = *vcpu_cpsr(vcpu); 221 unsigned long cpsr = *vcpu_cpsr(vcpu);
222 bool is_arm = !(cpsr & PSR_T_BIT); 222 bool is_arm = !(cpsr & PSR_T_BIT);
223 223
224 BUG_ON(is_arm && (cpsr & PSR_IT_MASK)); 224 if (is_arm || !(cpsr & PSR_IT_MASK))
225
226 if (!(cpsr & PSR_IT_MASK))
227 return; 225 return;
228 226
229 cond = (cpsr & 0xe000) >> 13; 227 cond = (cpsr & 0xe000) >> 13;