Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27

1 files changed, 15 insertions, 14 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index f7ba099049ea..2d29e260da3d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -758,25 +758,26 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn)
  */
 void kvm_vcpu_block(struct kvm_vcpu *vcpu)
 {
-        DECLARE_WAITQUEUE(wait, current);
-
-        add_wait_queue(&vcpu->wq, &wait);
-
-        /*
-         * We will block until either an interrupt or a signal wakes us up
-         */
-        while (!kvm_cpu_has_interrupt(vcpu)
-               && !kvm_cpu_has_pending_timer(vcpu)
-               && !signal_pending(current)
-               && !kvm_arch_vcpu_runnable(vcpu)) {
-                set_current_state(TASK_INTERRUPTIBLE);
+        DEFINE_WAIT(wait);
+
+        for (;;) {
+                prepare_to_wait(&vcpu->wq, &wait, TASK_INTERRUPTIBLE);
+
+                if (kvm_cpu_has_interrupt(vcpu))
+                        break;
+                if (kvm_cpu_has_pending_timer(vcpu))
+                        break;
+                if (kvm_arch_vcpu_runnable(vcpu))
+                        break;
+                if (signal_pending(current))
+                        break;
+
                 vcpu_put(vcpu);
                 schedule();
                 vcpu_load(vcpu);
         }
 
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&vcpu->wq, &wait);
+        finish_wait(&vcpu->wq, &wait);
 }
 
 void kvm_resched(struct kvm_vcpu *vcpu)