diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-17 08:23:42 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-17 08:23:42 -0600 |
| commit | ed56954cf5a8b7abb530676a073d14f9de661d69 (patch) | |
| tree | 4b7dcd9a516a941ef72564387548714e577b45aa /drivers/infiniband/sw/siw | |
| parent | 6830d50325ee27fbf0150f77cbec1ed304a5b8f6 (diff) | |
| parent | 5244ca88671a1981ceec09c5c8809f003e6a62aa (diff) | |
| download | linux-stable-ed56954cf5a8b7abb530676a073d14f9de661d69.tar.gz linux-stable-ed56954cf5a8b7abb530676a073d14f9de661d69.tar.bz2 linux-stable-ed56954cf5a8b7abb530676a073d14f9de661d69.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"Fix two build warnings on 32 bit platforms
It seems the linux-next CI and 0-day bot are not testing enough 32 bit
configurations, as soon as you merged the rdma pull request there were
two instant reports of warnings on these sytems that I would have
thought should have been covered by time in linux-next
Anyhow, here are the fixes so people don't hit problems with -Werror"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/siw: Fix pointer cast warning
RDMA/rxe: Fix compile warnings on 32-bit
Diffstat (limited to 'drivers/infiniband/sw/siw')
| -rw-r--r-- | drivers/infiniband/sw/siw/siw_qp_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/sw/siw/siw_qp_tx.c b/drivers/infiniband/sw/siw/siw_qp_tx.c index 7d47b521070b..05052b49107f 100644 --- a/drivers/infiniband/sw/siw/siw_qp_tx.c +++ b/drivers/infiniband/sw/siw/siw_qp_tx.c @@ -29,7 +29,7 @@ static struct page *siw_get_pblpage(struct siw_mem *mem, u64 addr, int *idx) dma_addr_t paddr = siw_pbl_get_buffer(pbl, offset, NULL, idx); if (paddr) - return virt_to_page((void *)paddr); + return virt_to_page((void *)(uintptr_t)paddr); return NULL; } |