diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 10:32:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 10:32:56 +0200 |
| commit | 896395c290f902576270d84291c1f7f8bfbe339d (patch) | |
| tree | 650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /arch/x86/kvm/lapic.c | |
| parent | x86, mpparse: build fix (diff) | |
| parent | Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-896395c290f902576270d84291c1f7f8bfbe339d.tar.xz linux-896395c290f902576270d84291c1f7f8bfbe339d.zip | |
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index c297c50eba63..ebc03f5ae162 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -940,6 +940,7 @@ static int __apic_timer_fn(struct kvm_lapic *apic) wait_queue_head_t *q = &apic->vcpu->wq; atomic_inc(&apic->timer.pending); + set_bit(KVM_REQ_PENDING_TIMER, &apic->vcpu->requests); if (waitqueue_active(q)) { apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; wake_up_interruptible(q); |