Merge tag 'fbdev-v5.2' of git://github.com/bzolnier/linux

[sfrench/cifs-2.6.git] / include / rdma / ib_umem.h

diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h
index 73af05db04c7625f8225712f19c41a9a6bac4be8..040d853077c6015fc7ac8ebb40938c1b56ccc5c2 100644 (file)
--- a/include/rdma/ib_umem.h
+++ b/include/rdma/ib_umem.h
@@ -48,12 +48,11 @@ struct ib_umem {
        unsigned long           address;
        int                     page_shift;
        u32 writable : 1;
-       u32 hugetlb : 1;
        u32 is_odp : 1;
        struct work_struct      work;
        struct sg_table sg_head;
        int             nmap;
-       int             npages;
+       unsigned int    sg_nents;
 };
 
 /* Returns the offset of the umem start relative to the first page. */
@@ -87,6 +86,9 @@ void ib_umem_release(struct ib_umem *umem);
 int ib_umem_page_count(struct ib_umem *umem);
 int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offset,
                      size_t length);
+unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem,
+                                    unsigned long pgsz_bitmap,
+                                    unsigned long virt);
 
 #else /* CONFIG_INFINIBAND_USER_MEM */
 
@@ -104,6 +106,12 @@ static inline int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offs
                                    size_t length) {
        return -EINVAL;
 }
+static inline int ib_umem_find_best_pgsz(struct ib_umem *umem,
+                                        unsigned long pgsz_bitmap,
+                                        unsigned long virt) {
+       return -EINVAL;
+}
+
 #endif /* CONFIG_INFINIBAND_USER_MEM */
 
 #endif /* IB_UMEM_H */