git: 7f3c78fbc9b4 - main - vm_pager: Remove references to KVME_TYPE_DEFAULT in the kernel

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=7f3c78fbc9b41b720c965c1fa9dd1ecfa25fb507

commit 7f3c78fbc9b41b720c965c1fa9dd1ecfa25fb507
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-07-16 15:31:08 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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;