diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-07-28 16:26:16 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-28 16:26:16 +0100 |
| commit | a394cf6e854d40968d43693597532a242019e337 (patch) | |
| tree | 7bf6e1db24c7cabeccfafe6001c91daa642412f4 /arch/arm64/kvm/hyp/aarch32.c | |
| parent | c9dc95005a681cf93c4012f7cc75eaa0ad12bfdc (diff) | |
| parent | a59a2edbbba7397fede86e40a3da17e5beebf98b (diff) | |
| download | linux-a394cf6e854d40968d43693597532a242019e337.tar.gz linux-a394cf6e854d40968d43693597532a242019e337.tar.bz2 linux-a394cf6e854d40968d43693597532a242019e337.zip | |
Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next-WIP
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/aarch32.c')
| -rw-r--r-- | arch/arm64/kvm/hyp/aarch32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/aarch32.c b/arch/arm64/kvm/hyp/aarch32.c index f9ff67dfbf0b..ae56d8a4b382 100644 --- a/arch/arm64/kvm/hyp/aarch32.c +++ b/arch/arm64/kvm/hyp/aarch32.c @@ -51,7 +51,7 @@ bool kvm_condition_valid32(const struct kvm_vcpu *vcpu) int cond; /* Top two bits non-zero? Unconditional. */ - if (kvm_vcpu_get_hsr(vcpu) >> 30) + if (kvm_vcpu_get_esr(vcpu) >> 30) return true; /* Is condition field valid? */ |