From nobody Wed May 25 07:05:32 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 04F9E1AEB76E; Wed, 25 May 2022 07:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L7MXX6Q6gz3Q6c; Wed, 25 May 2022 07:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653462332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXgsXFUrqeHaF/xlCFNANJaniYVT2RtWvmV4Gk1Fmc4=; b=Rf8WewC5DiGKc+yhR6Z3Z0R2EyGEYe3TgivSb1vts3WiszSRFrlZB0ss1+O7pwycMdZ721 WFGGzlBBs0oev7yT4BuIiRfooIC34LFENnm6Ewzpz0vJuUSZva+rlUs7Z2TweG+0Od8JMH OmHcgAhElgOJ7XE4CIWtqyFnGpSw0UAamFAA908FnBiBgkD9Jd5LwxYgWGc0LZ8IS3kvGy HSwbPVWaKDzpAln5nq4R2oGhx76K3vFt4z5U59PKdGvyZiLysmWLAro6PamI1KjZh2O4E+ ylQaRkd1qqgWctFDJ34oYWPw/3wjXaEvWeLcbqL9NoqxcbxgBDH3aDk5NpFfSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BCBC214AD6; Wed, 25 May 2022 07:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24P75Wmu057598; Wed, 25 May 2022 07:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24P75Wg7057597; Wed, 25 May 2022 07:05:32 GMT (envelope-from git) Date: Wed, 25 May 2022 07:05:32 GMT Message-Id: <202205250705.24P75Wg7057597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: a6e275af4664 - main - irdma(4): Fix previous commit that broke build on amd64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6e275af46644af1de365a1edf19742bfa28bb69 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653462332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXgsXFUrqeHaF/xlCFNANJaniYVT2RtWvmV4Gk1Fmc4=; b=CokeybQWt5y/Xn7taJKvKiaAJZDUv62sNlrXtaVVqgRn+PpTKDa0aiKD7mHzTMx8QCxzU6 9z3knkIA/Wy1PDkJg6p5LMwekxzR7ua8FxCRrMGD9z6W/FsAYrPKU7ygBkqkWB96lZpr+8 h3J2mtBrzmIVumXTWkLMN/m8miQBoNejsOA1ytfQMkWjjqGh6k+SQMg0iC1klPpEOZNZE6 swZk1bngVV6q74wn65Rkggv6F3AVwh7NF7dIN4aB2GkAKLd5OiFk8u/PEyUzI1fyPsLyD4 h45dPUWmaNWO2qIxLnU0RM+RNyMOT2UA7n7aSobUhA7JNxWWmYiCfC/245J8qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653462332; a=rsa-sha256; cv=none; b=SB6K7fzcCwvKIiCS6bX5n6RBMWooGCXovnX1VZJP9s5DH6iAoKybSmWSgs+0S+rVLGWe9k pk4/KdiJMEO/zro8/G+ZP2uMTvJtoucFJeVs4zyIDVdT1WKZFyYB6bFIxaep4kaL8bHzfD fDH431BlP5b7Hkydwix9wqoGvv+HdOBAR+tgHAjF/7zTURkrVmVXkmntAZVJP85XQFGtPb NE5C+SAgH4ZwMqSDZYjNYCglcl/6mhPxWlFjfeAMbAbjoVzczA5HfpLuzLDLpkzeZn7Djj tzg3DR5HwpVFRxpG8umYWk4jBQoHbh1GPcpEM2rltrnQeqAx2E5Tq5Qm4FUw+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=a6e275af46644af1de365a1edf19742bfa28bb69 commit a6e275af46644af1de365a1edf19742bfa28bb69 Author: Eric Joyner AuthorDate: 2022-05-25 06:52:57 +0000 Commit: Eric Joyner 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 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)