From nobody Fri Nov 11 18:36:42 2022 X-Original-To: dev-commits-src-branches@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 4N86qb1rd0z4dbbY; Fri, 11 Nov 2022 18:36:43 +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 4N86qb153Cz3vcj; Fri, 11 Nov 2022 18:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668191803; 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=G9VubhR5Z5mIe8ohLqMa4vND1RNaowIy8mMw+OQZovk=; b=kOa7HZ/46YBmmHE1JiI40gwatMiJNV5Scyqk78kogy441bC8K6UlCzAiE64e1mxDtHqPdZ TPHtTlg08TxvmSHvpZEWMjer3jvfLunG//U3JFBMcgLczTm6qbgz/Fs06S1zz6fSablky3 3mQwG0NNzjsfqGLJB6MV8hOO9lumx2IpOM8uEmR9no7CBlvUYjWa5rdK319OzbiRpsYKfQ 1WHrB4yzbFZRpcLHKbf7AU/WmCZHnOGV3OpVQP2nsECUTWX4lKv9GBSRL8h1UNZGwcwxwi xyZ1SJVklMDUbNFUzh+z6dQ5VO0Ll3qXBVxtt3PYBGm5ihDoYslMakn6Mrrf5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668191803; 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=G9VubhR5Z5mIe8ohLqMa4vND1RNaowIy8mMw+OQZovk=; b=c8P9920Hmix6Xdb+QbLuDPa+9Oy1NiktDLuQew5ZPc0cRTPVA/XJitFKulaEvCxSHu96FL yEahObV/xm6Zcy9Mt1+/dctDsT04Sd4uzBFgIzXjWG7cvgcNwAgaTQbFbLSdsdZPvsIob3 03R3bcjYDqzc/WtU3xbot2hYL+xQxo2+kdsRM0WCb2VJo631mKh1uq2Wg0Y6tMNn79QQGT M8w0dMoY4C3sVwU3EZUytFAlFoJ8hGJz+E1bJZ3z0w7WbbQCQ5bazqMumrtUYbqLb8q3lw TwK6bShjMMDA6PsF+6lRjmlQcuf0g33CEsvJU98ApeNlnjo7dxPhQomjlTJ9qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668191803; a=rsa-sha256; cv=none; b=WuxsgHflC9yKB2Y2AHonL1VmpNMcyDKOkSlUoO2xWpJilxKuGYLCHI5+4/kExjYWmzvQAL Ylsqvw+b2GO+xcIZopNFt56Bmo9fQB/QlL7m5cjqNLqNGW/PRW3in0UnMhmDfVdRbY8VYR STr/t7ATgImFARR8S3g2fYiJtvUf5noq9qR2T2iRFuRo1Em/8/B8qkl7XSecmIEWq41PIB orzz52Ajgjq1ytBQ3N8SqWVyfYYNGsu+6E9xpcQtRTQ9bgjeUsGnia9QPEC5C2gAUFjEg2 h0sqyb1MbQpTdgCsZ+wkubLqKq5cs4CHY2CVlCr/8t3gpSsVEKlQ63PArTd2mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N86qZ74BWzt9L; Fri, 11 Nov 2022 18:36:42 +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 2ABIagkX003953; Fri, 11 Nov 2022 18:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABIage8003952; Fri, 11 Nov 2022 18:36:42 GMT (envelope-from git) Date: Fri, 11 Nov 2022 18:36:42 GMT Message-Id: <202211111836.2ABIage8003952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 32560694f776 - stable/13 - Fix various places which cast a pointer to a vm_paddr_t or vice versa. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 32560694f77652d22f746b91ca60227ef864b0c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=32560694f77652d22f746b91ca60227ef864b0c4 commit 32560694f77652d22f746b91ca60227ef864b0c4 Author: John Baldwin AuthorDate: 2022-10-03 23:10:41 +0000 Commit: John Baldwin CommitDate: 2022-11-11 18:18:53 +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 (cherry picked from commit a9fca3b987bcfa16d457b15cba2de46000f6bb86) --- 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 ce7c0b711eba..5a77159ec4b1 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 9b5b588234c4..49051c702df7 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);