diff options
| author |   Geliang Tang <geliangtang@163.com> | 2015-10-03 11:00:14 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-04 13:11:19 +0100 |
| commit | 0bc2763f569ff9533a8222bcb884ef0e22569a72 (patch) | |
| tree | 34e61d65641d93f4620b234420bf94b4c52b758c /drivers/staging/rdma/amso1100 | |
| parent | IB/ipath: use offset_in_page macro (diff) | |
| download | linux-dev-0bc2763f569ff9533a8222bcb884ef0e22569a72.tar.xz linux-dev-0bc2763f569ff9533a8222bcb884ef0e22569a72.zip | |
RDMA/amso1100: use offset_in_page macro
Use offset_in_page macro instead of (addr & ~PAGE_MASK).
Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rdma/amso1100')
| -rw-r--r-- | drivers/staging/rdma/amso1100/c2_alloc.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rdma/amso1100/c2_provider.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rdma/amso1100/c2_alloc.c b/drivers/staging/rdma/amso1100/c2_alloc.c index 78d247ec6961..039872dfabbc 100644 --- a/drivers/staging/rdma/amso1100/c2_alloc.c +++ b/drivers/staging/rdma/amso1100/c2_alloc.c @@ -131,7 +131,7 @@ void c2_free_mqsp(__be16 *mqsp) *mqsp = (__force __be16) head->head; /* Compute the shared_ptr index */ - idx = ((unsigned long) mqsp & ~PAGE_MASK) >> 1; + idx = (offset_in_page(mqsp)) >> 1; idx -= (unsigned long) &(((struct sp_chunk *) 0)->shared_ptr[0]) >> 1; /* Point this index at the head */ diff --git a/drivers/staging/rdma/amso1100/c2_provider.c b/drivers/staging/rdma/amso1100/c2_provider.c index 25c3f0085563..956d76b111b0 100644 --- a/drivers/staging/rdma/amso1100/c2_provider.c +++ b/drivers/staging/rdma/amso1100/c2_provider.c @@ -359,7 +359,7 @@ static struct ib_mr *c2_reg_phys_mr(struct ib_pd *ib_pd, for (i = 0; i < num_phys_buf; i++) { - if (buffer_list[i].addr & ~PAGE_MASK) { + if (offset_in_page(buffer_list[i].addr)) { pr_debug("Unaligned Memory Buffer: 0x%x\n", (unsigned int) buffer_list[i].addr); return ERR_PTR(-EINVAL); |