From ea8e60601dc063ab74ddf7fedd25227d4a2cd43d Mon Sep 17 00:00:00 2001 From: Dotan Barak Date: Wed, 1 Aug 2007 13:33:56 +0300 Subject: [PATCH] --- yaml --- r: 64097 b: refs/heads/master c: 92ddc447ce7382e36b72a240697c00bf4beb8d75 h: refs/heads/master i: 64095: 9c8198380422eff89f6e0532283bde98ba20519e v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/umem.c | 5 +++++ trunk/include/rdma/ib_verbs.h | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4a6c5ffd53a7..a1f70cac18c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfb3ea125174813cdf87b1120caf0c9bd580283e +refs/heads/master: 92ddc447ce7382e36b72a240697c00bf4beb8d75 diff --git a/trunk/drivers/infiniband/core/umem.c b/trunk/drivers/infiniband/core/umem.c index 26d0470eef6e..664d2faa9e74 100644 --- a/trunk/drivers/infiniband/core/umem.c +++ b/trunk/drivers/infiniband/core/umem.c @@ -40,6 +40,11 @@ #include "uverbs.h" +#define IB_UMEM_MAX_PAGE_CHUNK \ + ((PAGE_SIZE - offsetof(struct ib_umem_chunk, page_list)) / \ + ((void *) &((struct ib_umem_chunk *) 0)->page_list[1] - \ + (void *) &((struct ib_umem_chunk *) 0)->page_list[0])) + static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dirty) { struct ib_umem_chunk *chunk, *tmp; diff --git a/trunk/include/rdma/ib_verbs.h b/trunk/include/rdma/ib_verbs.h index 7a99f1125d24..4bea182d7116 100644 --- a/trunk/include/rdma/ib_verbs.h +++ b/trunk/include/rdma/ib_verbs.h @@ -733,11 +733,6 @@ struct ib_udata { size_t outlen; }; -#define IB_UMEM_MAX_PAGE_CHUNK \ - ((PAGE_SIZE - offsetof(struct ib_umem_chunk, page_list)) / \ - ((void *) &((struct ib_umem_chunk *) 0)->page_list[1] - \ - (void *) &((struct ib_umem_chunk *) 0)->page_list[0])) - struct ib_pd { struct ib_device *device; struct ib_uobject *uobject;