Index: uvm_map.c
===================================================================
RCS file: /cvs/src/sys/uvm/uvm_map.c,v
retrieving revision 1.223
diff -u -p -r1.223 uvm_map.c
--- uvm_map.c	15 Sep 2016 02:00:18 -0000	1.223
+++ uvm_map.c	15 Sep 2016 03:41:56 -0000
@@ -270,12 +270,6 @@ void			 vmspace_validate(struct vm_map*)
 #define VMMAP_MIN_ADDR		PAGE_SIZE
 
 
-#ifdef DEADBEEF0
-#define UVMMAP_DEADBEEF		((void*)DEADBEEF0)
-#else
-#define UVMMAP_DEADBEEF		((void*)0xdeadd0d0)
-#endif
-
 #ifdef DEBUG
 int uvm_map_printlocks = 0;
 
@@ -433,10 +427,6 @@ uvm_mapent_addr_insert(struct vm_map *ma
 {
 	struct vm_map_entry *res;
 
-	if (RB_LEFT(entry, daddrs.addr_entry) != UVMMAP_DEADBEEF ||
-	    RB_RIGHT(entry, daddrs.addr_entry) != UVMMAP_DEADBEEF ||
-	    RB_PARENT(entry, daddrs.addr_entry) != UVMMAP_DEADBEEF)
-		panic("uvm_mapent_addr_insert: entry still in addr list");
 	KDASSERT(entry->start <= entry->end);
 	KDASSERT((entry->start & (vaddr_t)PAGE_MASK) == 0 &&
 	    (entry->end & (vaddr_t)PAGE_MASK) == 0);
@@ -465,8 +455,6 @@ uvm_mapent_addr_remove(struct vm_map *ma
 	res = RB_REMOVE(uvm_map_addr, &map->addr, entry);
 	if (res != entry)
 		panic("uvm_mapent_addr_remove");
-	RB_LEFT(entry, daddrs.addr_entry) = RB_RIGHT(entry, daddrs.addr_entry) =
-	    RB_PARENT(entry, daddrs.addr_entry) = UVMMAP_DEADBEEF;
 }
 
 /*
@@ -1699,12 +1687,6 @@ uvm_mapent_alloc(struct vm_map *map, int
 		if (me == NULL)
 			goto out;
 		me->flags = 0;
-	}
-
-	if (me != NULL) {
-		RB_LEFT(me, daddrs.addr_entry) =
-		    RB_RIGHT(me, daddrs.addr_entry) =
-		    RB_PARENT(me, daddrs.addr_entry) = UVMMAP_DEADBEEF;
 	}
 
 out: