D35791.id108248.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D35791.id108248.diff
View Options

	diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
	--- a/sys/fs/procfs/procfs_map.c
	+++ b/sys/fs/procfs/procfs_map.c
	@@ -167,7 +167,6 @@
	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
	--- a/sys/sys/user.h
	+++ b/sys/sys/user.h
	@@ -487,7 +487,7 @@
	* 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
	--- a/sys/vm/vm_object.c
	+++ b/sys/vm/vm_object.c
	@@ -2578,8 +2578,7 @@
	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;