From nobody Fri Jul 29 18:48:41 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 4Lvc3t3CSfz4Y221; Fri, 29 Jul 2022 18:48:42 +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 4Lvc3s3Yk3z3tXG; Fri, 29 Jul 2022 18:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120521; 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=TJv24n7hn8aw7ogjNTsBCYAQizZpiQFSgK+A2KeSoeg=; b=Re3zsLhJWMyHDcA1VnM52BgexTG+zZjPIMWtB0WkHFRhIy5cd+YH0ym2iLMH0fvLDz/g95 fZcNaaXbJwEHAVOj7pwqU1iETrPs91RDQUSdZWnEzonJsqCqOSEY8rG1DBgnHmm8V7H6Y8 5X8lWKTfiFbisx701OUax0ggZ+GYPo7S3P9EIQieOM3FptIBr4UTlaIne6/YlDHtVr7qUE SYcuvAcru2pgxMC+NB13GO2U0ewOR/ydYtZdXL8sqerLv+gkdRUNnzfp4dVWi22zkdOdUG C7hoShe08AQyyAlodDbcAQ1VRS6XHKpH9dhlXleQky9u0uyQ5Tgr4kek2yweYA== 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 4Lvc3s2cNxzlkL; Fri, 29 Jul 2022 18:48:41 +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 26TImfF9025700; Fri, 29 Jul 2022 18:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TImfpW025699; Fri, 29 Jul 2022 18:48:41 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:48:41 GMT Message-Id: <202207291848.26TImfpW025699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 91a308757bdc - stable/12 - Fix unused variable warning in amd64's pmap.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 91a308757bdce7dc680feb43debad46a22d539a5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120521; 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=TJv24n7hn8aw7ogjNTsBCYAQizZpiQFSgK+A2KeSoeg=; b=UymcJ7tk9iRcQvTEiCwzSe7hmz7f7mDPuepLdRDZ6qhrdTHNAvKAbWu0blFZN4ol2nsPoR yTTwc/2yGEztGFJNiqzyjcXoLOsWQu6n1YRznvQ0mhP7O9DrGAsSMZa5KDlbKHnONmbq5C wMT5KCrWRrmXF9YNYRSnIiCmAekBvah3ciw6NwtYBy5CcllTQ5sJsB0BPzjLmmVamS3Ovp MeP4chbxxhSxkFdCrd7bMtC4CDWv4mne1D0t69YiuD/87TijfRnIi8AjYrjrrJG9vFLiuD vSPxdqnwY9OLdaqB+vPztwJdsP3gFU+fbD+wQffe3MCDxAW1feH3AXCT8YWRmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120521; a=rsa-sha256; cv=none; b=ABgrWFUNZKvFanYlI6t3dTphiKxzGX1qEuOMvnJImkRfVOoRiKUHoHZtFw+Dzdal6A+uOh 8CfxBZKuexmnwpqkOoJpxXBObAx91gEbsC/2WcvPFXP4Hxa8cVxTn5Fuqyct6qgkaXCr/J rK4IAXwxV+p+C3LCO8n1Iwkag6RUxxM1YdtHUgx6zDhCannu9o76ZEXs2nO+qkd1O762Wq TUX48924Out6WD0pweuA2uhjZxMsKzidexMTxz9601QbkhT6F8FLP620vuOeYrTzUowgKz ZwNOJunXcHzBzOs0XB/0cRdME1UX3TjLYnAYPlOnBJxUXDxSph9yZBSKYCerQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=91a308757bdce7dc680feb43debad46a22d539a5 commit 91a308757bdce7dc680feb43debad46a22d539a5 Author: Dimitry Andric AuthorDate: 2022-07-26 19:53:08 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 18:44:10 +0000 Fix unused variable warning in amd64's pmap.c With clang 15, the following -Werror warning is produced: sys/amd64/amd64/pmap.c:8274:22: error: variable 'freed' set but not used [-Werror,-Wunused-but-set-variable] int allfree, field, freed, i, idx; ^ The 'freed' variable is only used when PV_STATS is defined. Ensure it is only declared and set in that case. MFC after: 3 days (cherry picked from commit 7a1f289bd2949e5867c7f0396c35f02f179dc8bd) --- sys/amd64/amd64/pmap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 945779bce9a0..b2fe589ed029 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6975,7 +6975,10 @@ pmap_remove_pages(pmap_t pmap) struct rwlock *lock; int64_t bit; uint64_t inuse, bitmask; - int allfree, field, freed, idx; + int allfree, field, idx; +#ifdef PV_STATS + int freed; +#endif boolean_t superpage; vm_paddr_t pa; @@ -7008,7 +7011,9 @@ pmap_remove_pages(pmap_t pmap) PMAP_LOCK(pmap); TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) { allfree = 1; +#ifdef PV_STATS freed = 0; +#endif for (field = 0; field < _NPCM; field++) { inuse = ~pc->pc_map[field] & pc_freemask[field]; while (inuse != 0) { @@ -7123,7 +7128,9 @@ pmap_remove_pages(pmap_t pmap) } } pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free); +#ifdef PV_STATS freed++; +#endif } } PV_STAT(atomic_add_long(&pv_entry_frees, freed));