From owner-p4-projects@FreeBSD.ORG  Mon Nov 12 15:46:25 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13F4A16A41B; Mon, 12 Nov 2007 15:46:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C60A16A417
	for <perforce@FreeBSD.org>; Mon, 12 Nov 2007 15:46:24 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EFC1513C4A8
	for <perforce@FreeBSD.org>; Mon, 12 Nov 2007 15:46:23 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACFkNWJ011041
	for <perforce@FreeBSD.org>; Mon, 12 Nov 2007 15:46:23 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACFkNFS011033
	for perforce@freebsd.org; Mon, 12 Nov 2007 15:46:23 GMT
	(envelope-from swise@FreeBSD.org)
Date: Mon, 12 Nov 2007 15:46:23 GMT
Message-Id: <200711121546.lACFkNFS011033@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise <swise@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 128976 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2007 15:46:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=128976

Change 128976 by swise@swise:vic10:iwarp on 2007/11/12 15:46:13

	Get rdma_verbs.c to compile.

Affected files ...

.. //depot/projects/iwarp/sys/contrib/rdma/ib_verbs.h#5 edit
.. //depot/projects/iwarp/sys/contrib/rdma/rdma_verbs.c#2 edit
.. //depot/projects/iwarp/sys/modules/rdma/Makefile#4 edit
.. //depot/projects/iwarp/sys/modules/rdma/core/Makefile#4 edit

Differences ...

==== //depot/projects/iwarp/sys/contrib/rdma/ib_verbs.h#5 (text+ko) ====

@@ -718,7 +718,7 @@
 	TAILQ_ENTRY(ib_uobject)	entry;		/* link to context's list */
 	u32			id;		/* index into kernel idr */
 	atomic_t		ref;
-	struct rwlock	        lock;		/* protects .live */
+	struct mtx	        lock;		/* protects .live */
 	int			live;
 };
 
@@ -884,11 +884,11 @@
 	char                          name[IB_DEVICE_NAME_MAX];
 
 	TAILQ_HEAD(, ib_event_handler) event_handler_list;
-	spinlock_t                    event_handler_lock;
+	struct mtx                    event_handler_lock;
 
         TAILQ_ENTRY(ib_device)        core_list;
         TAILQ_HEAD(, ib_client_data)  client_data_list;
-	spinlock_t                    client_data_lock;
+	struct mtx                    client_data_lock;
 
 	struct ib_cache               cache;
 	int                          *pkey_tbl_len;

==== //depot/projects/iwarp/sys/contrib/rdma/rdma_verbs.c#2 (text+ko) ====

@@ -38,12 +38,16 @@
  * $Id: verbs.c 1349 2004-12-16 21:09:43Z roland $
  */
 
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/string.h>
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/libkern.h>
+#include <sys/module.h>
+#include <sys/linux_compat.h>
 
-#include <rdma/ib_verbs.h>
-#include <rdma/ib_cache.h>
+#include <contrib/rdma/ib_verbs.h>
+#include <contrib/rdma/ib_cache.h>
 
 int ib_rate_to_mult(enum ib_rate rate)
 {

==== //depot/projects/iwarp/sys/modules/rdma/Makefile#4 (text+ko) ====

@@ -2,7 +2,7 @@
 
 SUBDIR=  addr
 SUBDIR+= cma
-#SUBDIR+= iwcm
-#SUBDIR+= core
+SUBDIR+= iwcm
+SUBDIR+= core
 
 .include <bsd.subdir.mk>

==== //depot/projects/iwarp/sys/modules/rdma/core/Makefile#4 (text+ko) ====

@@ -7,6 +7,6 @@
 SRCS= device_if.h bus_if.h pci_if.h pcib_if.h
 SRCS+= rdma_device.c
 SRCS+= rdma_cache.c
-#SRCS+= rdma_verbs.c
+SRCS+= rdma_verbs.c
 
 .include <bsd.kmod.mk>