From owner-svn-src-projects@FreeBSD.ORG  Thu Jul 29 02:24:21 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B046C106564A;
	Thu, 29 Jul 2010 02:24:21 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FB6B8FC16;
	Thu, 29 Jul 2010 02:24:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6T2OLFD002479;
	Thu, 29 Jul 2010 02:24:21 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6T2OLbY002477;
	Thu, 29 Jul 2010 02:24:21 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201007290224.o6T2OLbY002477@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Thu, 29 Jul 2010 02:24:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210594 - projects/ofed/head/sys/ofed/include/linux
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jul 2010 02:24:21 -0000

Author: jeff
Date: Thu Jul 29 02:24:21 2010
New Revision: 210594
URL: http://svn.freebsd.org/changeset/base/210594

Log:
   - Add the proper irq argument to the device structure.  This only works
     for devices with a single irq.  msi/msix are handled seperately.
   - Acquire giant before destroying devices it is required in the bus
     layer.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/device.h

Modified: projects/ofed/head/sys/ofed/include/linux/device.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/device.h	Thu Jul 29 02:22:54 2010	(r210593)
+++ projects/ofed/head/sys/ofed/include/linux/device.h	Thu Jul 29 02:24:21 2010	(r210594)
@@ -57,6 +57,7 @@ struct device {
 	struct class	*class;
 	void		(*release)(struct device *dev);
 	irqreturn_t	(*irqhandler)(int, void *);
+	void		*irqarg;
 	void		*irqtag;
 	struct kobject	kobj;
 	uint64_t	*dma_mask;
@@ -188,8 +189,10 @@ device_unregister(struct device *dev)
 	device_t bsddev;
 
 	bsddev = dev->bsddev;
+	mtx_lock(&Giant);
 	if (bsddev)
 		device_delete_child(device_get_parent(bsddev), bsddev);
+	mtx_unlock(&Giant);
 	put_device(dev);
 }