diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-28 08:54:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-28 08:54:25 +0200 |
| commit | 4a96d1a5f0c51a0c991fb47160eca305ba628110 (patch) | |
| tree | 42a33c4a256f6353256e7a5b0edc4285d0a65901 /drivers/infiniband/sw/rdmavt/mmap.c | |
| parent | 5204bf17031b69fa5faa4dc80a9dc1e2446d74f9 (diff) | |
| parent | cc66afea58f858ff6da7f79b8a595a67bbb4f9a9 (diff) | |
Merge branch 'ras/urgent' into ras/core, to pick up fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/sw/rdmavt/mmap.c')
| -rw-r--r-- | drivers/infiniband/sw/rdmavt/mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/rdmavt/mmap.c b/drivers/infiniband/sw/rdmavt/mmap.c index e202b8142759..6b712eecbd37 100644 --- a/drivers/infiniband/sw/rdmavt/mmap.c +++ b/drivers/infiniband/sw/rdmavt/mmap.c @@ -170,9 +170,9 @@ struct rvt_mmap_info *rvt_create_mmap_info(struct rvt_dev_info *rdi, spin_lock_irq(&rdi->mmap_offset_lock); if (rdi->mmap_offset == 0) - rdi->mmap_offset = PAGE_SIZE; + rdi->mmap_offset = ALIGN(PAGE_SIZE, SHMLBA); ip->offset = rdi->mmap_offset; - rdi->mmap_offset += size; + rdi->mmap_offset += ALIGN(size, SHMLBA); spin_unlock_irq(&rdi->mmap_offset_lock); INIT_LIST_HEAD(&ip->pending_mmaps); |