diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-03-28 17:34:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-28 17:34:19 +1000 |
| commit | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (patch) | |
| tree | 0da1c9aaf772fac30fe68590a4ca1c3dd439cebd /drivers/infiniband/sw/rxe/rxe_mmap.c | |
| parent | 65d1086c44791112188f6aebbdc3a27cab3736d3 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
Backmerge tag 'v4.11-rc4' into drm-next
Linux 4.11-rc4
The i915 GVT team need the rc4 code to base some more code on.
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_mmap.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_mmap.c b/drivers/infiniband/sw/rxe/rxe_mmap.c index c572a4c09359..bd812e00988e 100644 --- a/drivers/infiniband/sw/rxe/rxe_mmap.c +++ b/drivers/infiniband/sw/rxe/rxe_mmap.c @@ -156,10 +156,10 @@ struct rxe_mmap_info *rxe_create_mmap_info(struct rxe_dev *rxe, spin_lock_bh(&rxe->mmap_offset_lock); if (rxe->mmap_offset == 0) - rxe->mmap_offset = PAGE_SIZE; + rxe->mmap_offset = ALIGN(PAGE_SIZE, SHMLBA); ip->info.offset = rxe->mmap_offset; - rxe->mmap_offset += size; + rxe->mmap_offset += ALIGN(size, SHMLBA); spin_unlock_bh(&rxe->mmap_offset_lock); |