From nobody Mon Oct 03 23:11:13 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 4MhGmK4kSlz4V1N6; Mon, 3 Oct 2022 23:11:13 +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 4MhGmK4FQtz3PKL; Mon, 3 Oct 2022 23:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664838673; 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=EQQly5b/mcIvtWGM4RcWtkSup9lgDoHbvAXRf3yKIo0=; b=nuIddSLstAy4RJBh38CQZB16wvKQhCIbQ9zbGdRU0vb5GUXirn7iMuh+hxrhyyL3dt7c6c 8NrmahJrXt0Lj64u1CjlqdTyV48eThMK3jrz1eNUNpduXYRB+B4qRVSHwmHJ2mND6SYX6R IjHh1m749xAUBSOYirQ5J/9OB//wRty2RJAndt6h70O1du2PVtMGXzKOtZqjRcSti7OSGT 9AEL1iaQ+u0UVgl+0w9XvfaPbvuJGXfQ9Ym7VLkOHBengCo+Fsz5soraNuO+RiJoD/x509 6Q4pd8Ipo3Qhx1krMnOCHe/OnLJ6ajQPFoL8XzCKaTDpbZqaYr06p2/zS0OdYQ== 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 4MhGmK3JJwzMdN; Mon, 3 Oct 2022 23:11:13 +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 293NBD1Z065402; Mon, 3 Oct 2022 23:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293NBDJH065401; Mon, 3 Oct 2022 23:11:13 GMT (envelope-from git) Date: Mon, 3 Oct 2022 23:11:13 GMT Message-Id: <202210032311.293NBDJH065401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a9fca3b987bc - main - Fix various places which cast a pointer to a vm_paddr_t or vice versa. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9fca3b987bcfa16d457b15cba2de46000f6bb86 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664838673; 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=EQQly5b/mcIvtWGM4RcWtkSup9lgDoHbvAXRf3yKIo0=; b=JQrHZnUI7p4uIeDu4/q28EUyQZfXqD1F5sgPOCLSJnKnYg9GHHr14gbzSKM0ENbMdL2bUi t3Bsa/ZQgOgQ53Ys6mDDluZNOdpSxq66yXZ9DptjakiNY+g1Pdyz4aAGYoMbVi4OayHYXz bAAAZAYEQMokDLsMjWDFe4ZYNUSGIzkNlOoJVykv/RGgMlnbRifgoFveMpx1BLWPXX0MAJ K4ELDKjfQ73jhUT3xa7dRl8VAzFVPPM/g2dSZ33nY0XCmcV2fbFHgo63yonP4FKskaXXkc Qhnl+mwypRjkZ1NGXG/hEnmOqgYcoCFVLc2tBtCMdVEHzBnKqJefumu9JCU4Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664838673; a=rsa-sha256; cv=none; b=g4zMI1tEvT7oZNbXgLIYjPU+k2kwcDQUNZnBkQ4ySuINWh/1kTFEPOCKp8c0+mSR5bK6wG cl+nf1O3IK7dV7x0pt9vbchCD7aJCxYgKPp05nXu1LZ6BS9+pcI76/HajgQNoIMhMrLFCh O3a1QlhgJqflDU3MM//gopq57q3leH8EyD2gKGjQi/qbd8Wmx+aG4gjzsHiZSo6IsEgFGq aGi5kGiRo1rXO6kEg+V4ZWWt08cehrwHN7wSdmfpnntnYysSvD9IbeIQo0U3W3AIlUwest xxEceGC+oJbBABqwavb2Fn/ijtl4BaYJJ9zab1rp62/LYqG/qffsvFXevlyXVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a9fca3b987bcfa16d457b15cba2de46000f6bb86 commit a9fca3b987bcfa16d457b15cba2de46000f6bb86 Author: John Baldwin AuthorDate: 2022-10-03 23:10:41 +0000 Commit: John Baldwin CommitDate: 2022-10-03 23:10:41 +0000 Fix various places which cast a pointer to a vm_paddr_t or vice versa. GCC warns about the mismatched sizes on i386 where vm_paddr_t is 64 bits. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D36750 --- sys/dev/dcons/dcons_os.c | 2 +- sys/dev/fb/fbd.c | 4 ++-- sys/vm/vm_dumpset.h | 2 +- sys/x86/xen/hvm.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c index 1a5585598065..bc1fc007fcc9 100644 --- a/sys/dev/dcons/dcons_os.c +++ b/sys/dev/dcons/dcons_os.c @@ -331,7 +331,7 @@ dcons_drv_init(int stage) #ifdef __amd64__ dg.buf = (struct dcons_buf *)(vm_offset_t)(KERNBASE + addr); #else /* __i386__ */ - dg.buf = (struct dcons_buf *)((vm_offset_t)PMAP_MAP_LOW + + dg.buf = (struct dcons_buf *)(vm_offset_t)(PMAP_MAP_LOW + addr); #endif dg.size = size; diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c index 8dfc24707cd8..b640efa236b4 100644 --- a/sys/dev/fb/fbd.c +++ b/sys/dev/fb/fbd.c @@ -210,8 +210,8 @@ fbd_list(void) return (ENOENT); LIST_FOREACH(entry, &fb_list_head, fb_list) { - printf("FB %s @%p\n", entry->fb_info->fb_name, - (void *)entry->fb_info->fb_pbase); + printf("FB %s @%#jx\n", entry->fb_info->fb_name, + (uintmax_t)entry->fb_info->fb_pbase); } return (0); diff --git a/sys/vm/vm_dumpset.h b/sys/vm/vm_dumpset.h index f9ba6b2429c5..aef056246d96 100644 --- a/sys/vm/vm_dumpset.h +++ b/sys/vm/vm_dumpset.h @@ -92,7 +92,7 @@ vm_page_dump_index_to_pa(int bit) (dump_avail[i] & ~PAGE_MASK)); bit -= tot; } - return ((vm_paddr_t)NULL); + return (0); } #define VM_PAGE_DUMP_FOREACH(bitset, pa) \ diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 8d25e35e5151..8edbda445dd5 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -197,7 +197,7 @@ xen_hvm_init_hypercall_stubs(enum xen_hvm_init_type init_type) return (EINVAL); wrmsr(regs[1], (init_type == XEN_HVM_INIT_EARLY) - ? ((vm_paddr_t)&hypercall_page - KERNBASE) + ? (vm_paddr_t)((uintptr_t)&hypercall_page - KERNBASE) : vtophys(&hypercall_page)); return (0);