diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-06 11:16:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-06 11:16:23 -0700 |
| commit | 1b40a895df6c7d5a80e71f65674060b03d84bbef (patch) | |
| tree | cf79bd75779139d4fe5b247f909eb8974f1d9117 /virt | |
| parent | 97f8571e663c808ad2d01a396627235167291556 (diff) | |
| parent | 35baff256d8fe1eec0b8988fcb5cde80df7bfa1a (diff) | |
Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: IOAPIC: Fix level-triggered irq injection hang
x86: KVM guest: Add memory clobber to hypercalls
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/ioapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 1dcf9f3d1107..44589088941f 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -278,7 +278,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int gsi) ent->fields.remote_irr = 0; if (!ent->fields.mask && (ioapic->irr & (1 << gsi))) - ioapic_deliver(ioapic, gsi); + ioapic_service(ioapic, gsi); } void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) |