Author: dougm
Date: Tue Sep 17 02:53:59 2019
New Revision: 352433
URL: https://svnweb.freebsd.org/changeset/base/352433

Log:
  Remove dead code from vm_map_unlink_entry made dead by r351476, and also
  a no-longer-used enumerant.
  
  Reviewed by: alc
  Approved by: markj (mentor, implicit)
  Tested by: pho (as part of a larger change)
  Differential Revision: https://reviews.freebsd.org/D21668

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c        Tue Sep 17 00:22:20 2019        (r352432)
+++ head/sys/vm/vm_map.c        Tue Sep 17 02:53:59 2019        (r352433)
@@ -1250,7 +1250,6 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t entry)
 }
 
 enum unlink_merge_type {
-       UNLINK_MERGE_PREV,
        UNLINK_MERGE_NONE,
        UNLINK_MERGE_NEXT
 };
@@ -1266,17 +1265,9 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t entry
        KASSERT(root != NULL,
            ("vm_map_entry_unlink: unlink object not mapped"));
 
+       vm_map_splay_findnext(root, &rlist);
        switch (op) {
-       case UNLINK_MERGE_PREV:
-               vm_map_splay_findprev(root, &llist);
-               llist->end = root->end;
-               y = root->right;
-               root = llist;
-               llist = root->right;
-               root->right = y;
-               break;
        case UNLINK_MERGE_NEXT:
-               vm_map_splay_findnext(root, &rlist);
                rlist->start = root->start;
                rlist->offset = root->offset;
                y = root->left;
@@ -1286,7 +1277,6 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t entry
                break;
        case UNLINK_MERGE_NONE:
                vm_map_splay_findprev(root, &llist);
-               vm_map_splay_findnext(root, &rlist);
                if (llist != &map->header) {
                        root = llist;
                        llist = root->right;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to