From nobody Fri Nov 18 17:04:31 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 4NDNRz74qyz4htqk; Fri, 18 Nov 2022 17:04:31 +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 4NDNRz6fCbz46Gd; Fri, 18 Nov 2022 17:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668791071; 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=bmr1xlZtH46v+StCc7TjBB/Nm97NePLPdTAsiVOgzk8=; b=OBw5F7zbPCcEE0G4I3oPGDlkA50s2tL6RlrTgdpq5UdZu4PORoXVkPxtsj/yIUtev6boG7 kFEkgFg7Z44Oe9vrsx3zW0kyEWy1gtcBIiA4X0DEVZmp406fz5gD9iIqMHmK+LJ8Wfy7I0 MBg2F0Za79jd2alOztzZg/l4lUnrh/wv+LK2t+wR218jeNaHtLAL+5eJnNjmkH8SmwBgxC 4a2sEhxiw9PFIce4+QqjLzbe9CY84yTFzykqRinzOg/SkG7zmwpNGPp4RLcZxlsiqsXiHa JotvN2bceuUAbBSNlxYnvpoC0AFvp1Q5ralnf2ZQu9qyDQ2o+kwTiElRdvNTtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668791071; 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=bmr1xlZtH46v+StCc7TjBB/Nm97NePLPdTAsiVOgzk8=; b=NGyAIhQWAs+KQVmxOrJfmh5YVYBEgz6IL84o3UA7ftf75CS0BEOZaM7pB9GaBgSe3Gx08U nzYla9iOX4HaYaX4+LSoQQrvg3ogRHprrofub5FXqKihwHeFkpW2mhVEpAetsJqySLfao4 NBQsd/bUyngr1yAL60KoXx29ibOq4cq1pyOsOzqoIZyFLa+MeceX9rlRY7p3aatKk4eWpf OSc7vWYyWqVpyElPXi4M74TdW6eBioSEbiWfrN5YPWcX0TspDq6H2tj5nXROxxpfh2AxDs WydGPFsFlRTn3/WylDAsbOVDw4X5Z1SgCX4B978XqJmrdd6NREQTQPy9xO8Oeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668791071; a=rsa-sha256; cv=none; b=Dyy/V2lIYqVD4XBBkjnyQuu9zeZW5c6ZKnDJLv5dCM/5BivLt/sYLw/QfsfVK+tt+J/wU9 DwKV4y0Dq+KaFt7jIaqB8gvjkLbvKUWbBffWklR4wz+tBBbShLb5rXTkq7en90ryQXU/M7 6bYOq2tOI88TGYCjiWzhSqIgq2aZw8H9tCaed84UuhaECahWQuaq3PCL6I5fekwnT79qf9 CQS0YkbuTK3BtVvUPqgOXIFAzwBo0m1FIt1XBrdVCFZtqx02yEB9cU9t2NwPagLJVDkQrM cmiKnxoX/pmnN34uLV1S4VXYJuH0QAG4os9kRB9vTCUOelN1DvnnpE+8d50LUw== 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 4NDNRz5jXQz1SP8; Fri, 18 Nov 2022 17:04:31 +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 2AIH4VDh015567; Fri, 18 Nov 2022 17:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIH4VdO015565; Fri, 18 Nov 2022 17:04:31 GMT (envelope-from git) Date: Fri, 18 Nov 2022 17:04:31 GMT Message-Id: <202211181704.2AIH4VdO015565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1a1fd76d0a36 - main - arm64/pmap: freed only used for PV_STATS 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a1fd76d0a36f2d0502836841f0e283597ffcc4d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a1fd76d0a36f2d0502836841f0e283597ffcc4d commit 1a1fd76d0a36f2d0502836841f0e283597ffcc4d Author: Warner Losh AuthorDate: 2022-11-18 17:04:04 +0000 Commit: Warner Losh CommitDate: 2022-11-18 17:04:04 +0000 arm64/pmap: freed only used for PV_STATS When PV_STATS is defined, freed is used. Otherwise it isn't. Mark it as __pvused and define __pvused appropriately. Sponsored by: Netflix Reviewed by: tsoome, rpokala, andrew Differential Revision: https://reviews.freebsd.org/D37438 --- sys/arm64/arm64/pmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 7df16bc41922..3f4665921631 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -180,8 +180,10 @@ __FBSDID("$FreeBSD$"); #ifdef PV_STATS #define PV_STAT(x) do { x ; } while (0) +#define __pvused #else #define PV_STAT(x) do { } while (0) +#define __pvused __unused #endif #define pmap_l0_pindex(v) (NUL2E + NUL1E + ((v) >> L0_SHIFT)) @@ -5405,7 +5407,8 @@ pmap_remove_pages(pmap_t pmap) struct rwlock *lock; int64_t bit; uint64_t inuse, bitmask; - int allfree, field, freed, i, idx, lvl; + int allfree, field, i, idx, lvl; + int freed __pvused; vm_paddr_t pa; lock = NULL;