From owner-p4-projects@FreeBSD.ORG  Sat Oct 20 19:54:42 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A4EC716A421; Sat, 20 Oct 2007 19:54:42 +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 E704316A417
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 19:54:41 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 809B613C45A
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 19:53:45 +0000 (UTC)
	(envelope-from kmacy@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 l9KJrj9N042714
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 19:53:45 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJrjfr042711
	for perforce@freebsd.org; Sat, 20 Oct 2007 19:53:45 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 20 Oct 2007 19:53:45 GMT
Message-Id: <200710201953.l9KJrjfr042711@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127833 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: Sat, 20 Oct 2007 19:54:43 -0000

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

Change 127833 by kmacy@kmacy_home:ethng on 2007/10/20 19:53:15

	make umem buildable
	update to reflect separate header for linux atomics

Affected files ...

.. //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#2 edit
.. //depot/projects/ethng/src/sys/contrib/rdma/ib_user_verbs.h#2 edit
.. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#5 edit

Differences ...

==== //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#2 (text+ko) ====

@@ -33,31 +33,34 @@
 #ifndef IB_UMEM_H
 #define IB_UMEM_H
 
-#include <linux/list.h>
-#include <linux/scatterlist.h>
-#include <linux/workqueue.h>
+#include <sys/linux_atomic.h>
+#include <sys/linux_compat.h>
+#include <sys/linux_pci.h>
+
 
 struct ib_ucontext;
 
+struct ib_umem_chunk {
+	TAILQ_ENTRY(ib_umem_chunk) entry;
+	int                     nents;
+	int                     nmap;
+	struct scatterlist      page_list[0];
+};
+
 struct ib_umem {
 	struct ib_ucontext     *context;
 	size_t			length;
 	int			offset;
 	int			page_size;
 	int                     writable;
-	struct list_head	chunk_list;
+	TAILQ_HEAD(, ib_umem_chunk) chunk_list;
+#ifdef notyet	
 	struct work_struct	work;
 	struct mm_struct       *mm;
+#endif	
 	unsigned long		diff;
 };
 
-struct ib_umem_chunk {
-	struct list_head	list;
-	int                     nents;
-	int                     nmap;
-	struct scatterlist      page_list[0];
-};
-
 #ifdef CONFIG_INFINIBAND_USER_MEM
 
 struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
@@ -67,7 +70,6 @@
 
 #else /* CONFIG_INFINIBAND_USER_MEM */
 
-#include <linux/err.h>
 
 static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context,
 					  unsigned long addr, size_t size,

==== //depot/projects/ethng/src/sys/contrib/rdma/ib_user_verbs.h#2 (text+ko) ====

@@ -38,7 +38,6 @@
 #ifndef IB_USER_VERBS_H
 #define IB_USER_VERBS_H
 
-#include <linux/types.h>
 
 /*
  * Increment this value if any changes that break userspace ABI

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

@@ -42,6 +42,7 @@
 #if !defined(IB_VERBS_H)
 #define IB_VERBS_H
 
+#include <sys/linux_atomic.h>
 #include <sys/linux_compat.h>
 #include <sys/linux_pci.h>