PERFORCE change 128976 for review

[Steve Wise]

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

Change 128976 by swise at 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>