diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-30 12:38:26 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-30 12:38:26 +0200 |
| commit | 04a7ea04d508b925e7f829305b358157d58b4f82 (patch) | |
| tree | d75fb98c733277ba35986046103595c3cb79c39b /virt/kvm/arm/aarch32.c | |
| parent | KVM: LAPIC: Fix lapic timer injection delay (diff) | |
| parent | arm64: Remove a redundancy in sysreg.h (diff) | |
| download | linux-04a7ea04d508b925e7f829305b358157d58b4f82.tar.xz linux-04a7ea04d508b925e7f829305b358157d58b4f82.zip | |
Merge tag 'kvmarm-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM updates for 4.13
- vcpu request overhaul
- allow timer and PMU to have their interrupt number
selected from userspace
- workaround for Cavium erratum 30115
- handling of memory poisonning
- the usual crop of fixes and cleanups
Conflicts:
arch/s390/include/asm/kvm_host.h
Diffstat (limited to 'virt/kvm/arm/aarch32.c')
| -rw-r--r-- | virt/kvm/arm/aarch32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/aarch32.c b/virt/kvm/arm/aarch32.c index 528af4b2d09e..79c7c357804b 100644 --- a/virt/kvm/arm/aarch32.c +++ b/virt/kvm/arm/aarch32.c @@ -60,7 +60,7 @@ static const unsigned short cc_map[16] = { /* * Check if a trapped instruction should have been executed or not. */ -bool kvm_condition_valid32(const struct kvm_vcpu *vcpu) +bool __hyp_text kvm_condition_valid32(const struct kvm_vcpu *vcpu) { unsigned long cpsr; u32 cpsr_cond; |