Merge branch 'linux-2.6'

[linux-2.6] / include / rdma / ib_umem.h

diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h
index 06307f7e43e0d0c9f8e5ca2458963279178e5dc4..22298423cf0b3d0e597e347de0ab376b8bbcaf24 100644 (file)
--- a/include/rdma/ib_umem.h
+++ b/include/rdma/ib_umem.h
@@ -35,6 +35,7 @@
 
 #include <linux/list.h>
 #include <linux/scatterlist.h>
+#include <linux/workqueue.h>
 
 struct ib_ucontext;
 
@@ -44,7 +45,11 @@ struct ib_umem {
        int                     offset;
        int                     page_size;
        int                     writable;
+       int                     hugetlb;
        struct list_head        chunk_list;
+       struct work_struct      work;
+       struct mm_struct       *mm;
+       unsigned long           diff;
 };
 
 struct ib_umem_chunk {