diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-24 12:09:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-24 12:09:22 -0700 |
| commit | 9bf8d8bcf3cebe44863188f1f2d822214e84f5b1 (patch) | |
| tree | 4811a0d2e5ebb8cefe61d82d0b544091bbff236f /arch/x86/kvm/vmx/posted_intr.h | |
| parent | c51ae1247262d4b19451ded1107d9b1b69c57541 (diff) | |
| parent | 77377064c3a94911339f13ce113b3abf265e06da (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"Two fixes for this merge window, and an unrelated bugfix for a host
hang"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: ioapic: break infinite recursion on lazy EOI
KVM: vmx: rename pi_init to avoid conflict with paride
KVM: x86/mmu: Avoid modulo operator on 64-bit value to fix i386 build
Diffstat (limited to 'arch/x86/kvm/vmx/posted_intr.h')
| -rw-r--r-- | arch/x86/kvm/vmx/posted_intr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx/posted_intr.h b/arch/x86/kvm/vmx/posted_intr.h index e53b97f82097..0bdc41391c5b 100644 --- a/arch/x86/kvm/vmx/posted_intr.h +++ b/arch/x86/kvm/vmx/posted_intr.h @@ -91,9 +91,9 @@ void vmx_vcpu_pi_put(struct kvm_vcpu *vcpu); int pi_pre_block(struct kvm_vcpu *vcpu); void pi_post_block(struct kvm_vcpu *vcpu); void pi_wakeup_handler(void); -void __init pi_init(int cpu); +void __init pi_init_cpu(int cpu); bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu); int pi_update_irte(struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq, bool set); -#endif /* __KVM_X86_VMX_POSTED_INTR_H */
\ No newline at end of file +#endif /* __KVM_X86_VMX_POSTED_INTR_H */ |