From patchwork Wed Jan 13 17:12:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 72679 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0DHGDeO023570 for ; Wed, 13 Jan 2010 17:16:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756169Ab0AMRPl (ORCPT ); Wed, 13 Jan 2010 12:15:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756198Ab0AMRPi (ORCPT ); Wed, 13 Jan 2010 12:15:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50693 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756137Ab0AMRPg (ORCPT ); Wed, 13 Jan 2010 12:15:36 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0DHFZAi029695 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Jan 2010 12:15:36 -0500 Received: from redhat.com (vpn2-11-140.ams2.redhat.com [10.36.11.140]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o0DHFXGc012740; Wed, 13 Jan 2010 12:15:33 -0500 Date: Wed, 13 Jan 2010 19:12:39 +0200 From: "Michael S. Tsirkin" To: Davide Libenzi , "Michael S. Tsirkin" , Avi Kivity , kvm@vger.kernel.org, Linux Kernel Mailing List Subject: [PATCH 2/2] kvm: do not store wqh in irqfd Message-ID: <20100113171239.GC19798@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index a9d3fc6..ee17ab4 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -47,7 +47,6 @@ struct _irqfd { int gsi; struct list_head list; poll_table pt; - wait_queue_head_t *wqh; wait_queue_t wait; struct work_struct inject; struct work_struct shutdown; @@ -159,8 +158,6 @@ irqfd_ptable_queue_proc(struct file *file, wait_queue_head_t *wqh, poll_table *pt) { struct _irqfd *irqfd = container_of(pt, struct _irqfd, pt); - - irqfd->wqh = wqh; add_wait_queue(wqh, &irqfd->wait); }