From nobody Mon Apr 18 19:08:56 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 DD02711D5A8D; Mon, 18 Apr 2022 19:08:56 +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 4KhxLJ4fVHz4S50; Mon, 18 Apr 2022 19:08:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650308936; 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=2DRO8sjSpiR+LxclSH/SWwzHGOrm1tCxIlPHEVmgTj4=; b=gRCdFwxWR/4ZUMB4nyJfaBAqjLRuYlw4deJQo2djs5qfgrt/zJxxHkvjIOdflVtatoDTUC td1QxfEqIKPy1ZqCsb50I3qKkvNxjbdWfMezPR69XfusJimof/TliU41k+qSCLdG/Zmlc7 eXRs8BxAOB7WH1570XQOH6+T1YmnPFC74W/kdNGKofPt6yKgZZYQZZqjL637JVARB9n+8p WQh16gv0GBcE78HbhuZfy2EYaWlvXRZir8DK/fvGgWx0LQq+fD5qZRZCtb5eN2pT9JSSCb SnhKo2RVHm26oozRo0FrEMYBB7pVTT7BXRZGZjbW/xjtGX+0MBRjtV1yY9J8mw== 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 6D0FA186B6; Mon, 18 Apr 2022 19:08:56 +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 23IJ8u23089643; Mon, 18 Apr 2022 19:08:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IJ8uL5089642; Mon, 18 Apr 2022 19:08:56 GMT (envelope-from git) Date: Mon, 18 Apr 2022 19:08:56 GMT Message-Id: <202204181908.23IJ8uL5089642@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: 52526922ac3b - main - vm_phys_init: Quiet unused but set warnings about npages. 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: 52526922ac3b4350fa8cc9767657a95787e200bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650308936; 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=2DRO8sjSpiR+LxclSH/SWwzHGOrm1tCxIlPHEVmgTj4=; b=NY5Dpr/5ryl5woE0G74E5fY4jNP7WtEqrFPS0S3UQFPmtg6l7G/KkNXbFjJbqxanq9ZPjz io81xfUKphyT9ekYF6fVsFuELlOibCObFf2fOqf4ID2LlG1yrdXslgT2jn1A592b6ljLD8 U2+uEut+D9wJsaF7VwmRjMQ4w4ErwkrhIfSypxp1m+uCj2lLoZRNO6Z+q/LHfmcKHDFT+i IC9dTblDsLijmMyzaPDlt0BwsnsqQTrmrSHtb2C7kXxaMG+7fJ0G8+Ij4K6pdtXcVS72H7 p7Ycxk1WNrfCPA7FkzmiJ8dbsH3apaM+ypMQi9Mrr04xlFGjkeZEJoabkkMQYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650308936; a=rsa-sha256; cv=none; b=PcFZHiu+xugDOvOi/uMGgT5bMwCWDW8HN2zxpy22RdjDwtANPAo6Xj9twrk4uaR0ntbKU+ Ssi0tsR5xO3Woc7bVW6nJJiB92ezwJgI/QEQkf9KMkjqKGJX7pSPQkRiLDA0cMnS7jcvCk YSaSxODyQ3V6/rJ3VNjAJuplHFORyFB7c1Bsinl1VDbbXAStrtgUGmAkn7TRjHo1IIsvop T55B5Vp/hstAmtu9XjK5k+RxbPFj6VbarFbqSe9wHuEYyZ3hUUYDPUmi7SFr6FWIb30/mI RcW7Jm/jT9lz7X7qn4n0SnF1Gb2+Kwmpc4o2iaLEuUm67f7s+Uyrfv7ZUEBXNw== 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=52526922ac3b4350fa8cc9767657a95787e200bb commit 52526922ac3b4350fa8cc9767657a95787e200bb Author: John Baldwin AuthorDate: 2022-04-18 19:06:14 +0000 Commit: John Baldwin CommitDate: 2022-04-18 19:06:14 +0000 vm_phys_init: Quiet unused but set warnings about npages. npages is used in two optional cases: - to conditionally create a separate DMA32 free list - to index vm_page_array for VM_PHYSSEG_SPARSE Add in more #ifdef's around npages statements. Reviewed by: alc, markj Differential Revision: https://reviews.freebsd.org/D34887 --- sys/vm/vm_phys.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 4e87a90fa154..a7ff4f14691e 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -487,7 +487,9 @@ vm_phys_init(void) { struct vm_freelist *fl; struct vm_phys_seg *end_seg, *prev_seg, *seg, *tmp_seg; +#if defined(VM_DMA32_NPAGES_THRESHOLD) || defined(VM_PHYSSEG_SPARSE) u_long npages; +#endif int dom, flind, freelist, oind, pind, segind; /* @@ -497,7 +499,9 @@ vm_phys_init(void) * Initially, the entries of vm_freelist_to_flind[] are set to either * 0 or 1 to indicate which free lists should be created. */ +#ifdef VM_DMA32_NPAGES_THRESHOLD npages = 0; +#endif for (segind = vm_phys_nsegs - 1; segind >= 0; segind--) { seg = &vm_phys_segs[segind]; #ifdef VM_FREELIST_LOWMEM @@ -520,7 +524,9 @@ vm_phys_init(void) else #endif { +#ifdef VM_DMA32_NPAGES_THRESHOLD npages += atop(seg->end - seg->start); +#endif vm_freelist_to_flind[VM_FREELIST_DEFAULT] = 1; } }