PERFORCE change 127833 for review
Kip Macy
kmacy at FreeBSD.org
Sat Oct 20 12:54:43 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127833
Change 127833 by kmacy at 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>
More information about the p4-projects
mailing list