From nobody Sun Jul 17 11:24:21 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 4Lm2mk2VCmz4T22f; Sun, 17 Jul 2022 11:24:22 +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 4Lm2mk1WpNz3PqV; Sun, 17 Jul 2022 11:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658057062; 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=TPGLcjfsn0iZz6+Zw0Nt8MPckSqDZVQntx8S3UVn6pc=; b=edjUoO9QUpnubT8vNC8+0nQcTyJSxNuX0Fs+4LVtV7iC+pB7fveT8QPD+rP7uhIXkLkl3m H/BuOdcpq6suuAUbr3ovITzjvTxOeFrZ1kgELFzdzL5qSNpdzJRSslkgxP75zU43q0RbEh jffepSfNzliiQc94c5t+9rKLNc+vMNgI0datcx1/8U5ff4zlHTzrE139vuZ1diBRp4HPSA LPNP2Vt5yHqQZiSntUnKUH+c53anYj/7wQnQaxDgNWpfmVmlftoD9tO2joD81fGSUGTALJ WooSUdF/yxJEipl6HSWwT8EYGn2t1C1Ejqcvw5YK6iNLYwV0y5xokXufhfocNA== 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 4Lm2mk0dSBzyY5; Sun, 17 Jul 2022 11:24:22 +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 26HBOLT9014329; Sun, 17 Jul 2022 11:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HBOL0m014328; Sun, 17 Jul 2022 11:24:21 GMT (envelope-from git) Date: Sun, 17 Jul 2022 11:24:21 GMT Message-Id: <202207171124.26HBOL0m014328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7f3c78fbc9b4 - main - vm_pager: Remove references to KVME_TYPE_DEFAULT in the kernel 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f3c78fbc9b41b720c965c1fa9dd1ecfa25fb507 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658057062; 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=TPGLcjfsn0iZz6+Zw0Nt8MPckSqDZVQntx8S3UVn6pc=; b=w1szST4L32glNktcobvAtJpFF4d5gZtqs/a7IM91tcBz8l+TNH9GOLg55gB9aaIUtdmvox wunDUuHK3V3vn7hM10kEVVK2N9npt6BkuPxSUUIC0nHQ+0i+J/0Mzi9xMSwgCmbUqPbUhL 9DAx9NOCqUr3mojyfkp0pNGwil77OE/A/7W1Vz6h2T1TNeHeQL9e398F92uGCL2Bb0wFqn 8RhP1UGkD5SUpzDRG6T8h9GRnbYLnKWuyZzoFgC78q5ooWOf1+hwTnuCTK8KTFxDuzX+UP OQaxt/Kv1zVqprpbRFLIdcycBNkVCwHip7peteuzaMHBVqDdifjX+fPUQnt32w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658057062; a=rsa-sha256; cv=none; b=yy/2mCiL+nqOgZipmpNGHfLlsb5g0OUUm0ZgpaKvLd83oW5TGfBcHP+vYrmQ9vAgj/Pv9y PTbB/Hv1tjlb7+1jHdvB1TyNPSCQJ8VQ9wpQMvJ9vJLHVN4iyv90SVtrk7tyfQS7pUFOF7 vTv8okcdsbjeg63oPhPQkACFNgI01onakIHnDz07Npd0ilDpH+DkagHg+hxXahiZU+LDXE NijWqP6bJhvtchVLmZHTTcP6E9TR04RFiCFpA0mLpvXMcoVXle8a9L9UOrIORTmoAFHzfp 2BpVtlXdbpjJXahrPv82PKp/4DTnxD513je3Zpl8sVwzxK+uywIx0FEB5y5osg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7f3c78fbc9b41b720c965c1fa9dd1ecfa25fb507 commit 7f3c78fbc9b41b720c965c1fa9dd1ecfa25fb507 Author: Mark Johnston AuthorDate: 2022-07-16 15:31:08 +0000 Commit: Mark Johnston CommitDate: 2022-07-17 11:09:48 +0000 vm_pager: Remove references to KVME_TYPE_DEFAULT in the kernel Keep the definition around since it's used by userspace. Reviewed by: alc, imp, kib Tested by: pho Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35791 --- sys/fs/procfs/procfs_map.c | 1 - sys/sys/user.h | 2 +- sys/vm/vm_object.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index bd4cd2c09c00..caca731afc34 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -167,7 +167,6 @@ procfs_doprocmap(PFS_FILL_ARGS) case KVME_TYPE_PHYS: type = "phys"; break; - case KVME_TYPE_DEFAULT: case KVME_TYPE_SWAP: type = "swap"; break; diff --git a/sys/sys/user.h b/sys/sys/user.h index d3257ffdf0f0..c9245dad67e7 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -487,7 +487,7 @@ struct kinfo_lockf { * another process as a series of entries. */ #define KVME_TYPE_NONE 0 -#define KVME_TYPE_DEFAULT 1 +#define KVME_TYPE_DEFAULT 1 /* no longer returned */ #define KVME_TYPE_VNODE 2 #define KVME_TYPE_SWAP 3 #define KVME_TYPE_DEVICE 4 diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 7304a42d9ae5..ab9d21c3a0b8 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2578,8 +2578,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) if (vp != NULL) { vref(vp); } else if ((obj->flags & OBJ_ANON) != 0) { - MPASS(kvo->kvo_type == KVME_TYPE_DEFAULT || - kvo->kvo_type == KVME_TYPE_SWAP); + MPASS(kvo->kvo_type == KVME_TYPE_SWAP); kvo->kvo_me = (uintptr_t)obj; /* tmpfs objs are reported as vnodes */ kvo->kvo_backing_obj = (uintptr_t)obj->backing_object;