git: a6e275af4664 - main - irdma(4): Fix previous commit that broke build on amd64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 May 2022 07:05:32 UTC
The branch main has been updated by erj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a6e275af46644af1de365a1edf19742bfa28bb69
commit a6e275af46644af1de365a1edf19742bfa28bb69
Author: Eric Joyner <erj@FreeBSD.org>
AuthorDate: 2022-05-25 06:52:57 +0000
Commit: Eric Joyner <erj@FreeBSD.org>
CommitDate: 2022-05-25 07:05:19 +0000
irdma(4): Fix previous commit that broke build on amd64
Changing the printf specifier to %p fixed the build on powerpc64, but it
actually broke the amd64 build since the type of the value to be printed
is uint64_t on amd64.
Instead, keep the new %p specifier but cast the printed argument to a
uintptr_t and then to a void * in order for it to be valid type for
%p.
Signed-off-by: Eric Joyner <erj@FreeBSD.org>
Reported by: jrtc27@
MFC after: 5 days
MFC-with: e602a30bb9fc7ee041a0e629d0fd2db7933ffa32
Sponsored by: Intel Corporation
---
sys/dev/irdma/icrdma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/irdma/icrdma.c b/sys/dev/irdma/icrdma.c
index 6867274d1cb8..1bc78dce90aa 100644
--- a/sys/dev/irdma/icrdma.c
+++ b/sys/dev/irdma/icrdma.c
@@ -501,7 +501,7 @@ irdma_probe(struct ice_rdma_peer *peer)
irdma_pr_info("probe: irdma-%s peer=%p, peer->pf_id=%d, peer->ifp=%p, peer->ifp->if_dunit=%d, peer->pci_mem->r_bustag=%p\n",
irdma_driver_version, peer, peer->pf_id, peer->ifp,
- pf_if_d(peer), peer->pci_mem->r_bustag);
+ pf_if_d(peer), (void *)(uintptr_t)peer->pci_mem->r_bustag);
hdl = irdma_find_handler(peer);
if (hdl)