From 82032cbb6cd830800a7f4d4d46ba15015235889b Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Wed, 13 Jan 2010 19:12:30 +0200
Subject: [PATCH] --- yaml --- r: 179959 b: refs/heads/master c:
 b6a114d27273c37cd0107b0f49af208168498f05 h: refs/heads/master i:   179957:
 99dca286c608f5eef8e872a62f83a2c523b9a13a   179955:
 9541896b8e5bf0d83f0f6e92a9e9298dd0e33d5f   179951:
 c6da42976eb0afb0dd25d21739ec30805c91729a v: v3

---
 [refs]                   | 2 +-
 trunk/virt/kvm/eventfd.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 22d268623705..042c28bf5c12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb289d6244a37cf932c571d6deb0daa8030f931b
+refs/heads/master: b6a114d27273c37cd0107b0f49af208168498f05
diff --git a/trunk/virt/kvm/eventfd.c b/trunk/virt/kvm/eventfd.c
index 62e4cd947a90..a9d3fc6c681c 100644
--- a/trunk/virt/kvm/eventfd.c
+++ b/trunk/virt/kvm/eventfd.c
@@ -72,12 +72,13 @@ static void
 irqfd_shutdown(struct work_struct *work)
 {
 	struct _irqfd *irqfd = container_of(work, struct _irqfd, shutdown);
+	u64 cnt;
 
 	/*
 	 * Synchronize with the wait-queue and unhook ourselves to prevent
 	 * further events.
 	 */
-	remove_wait_queue(irqfd->wqh, &irqfd->wait);
+	eventfd_ctx_remove_wait_queue(irqfd->eventfd, &irqfd->wait, &cnt);
 
 	/*
 	 * We know no new events will be scheduled at this point, so block