summaryrefslogtreecommitdiff
path: root/sys/uvm/uvm_map.h
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-09-16 01:09:55 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-09-16 01:09:55 +0000
commit90a41b12d0d3ed597f3bf81c14a16fb0a3c590c0 (patch)
tree4aafe8bf59854bceb32770f16db0446eabb185e3 /sys/uvm/uvm_map.h
parent1a90a048bf66c7d2b5d967fd9f635493303e8d41 (diff)
move the uvm_map_addr RB tree from RB macros to the RBT functions
this tree is interesting because it uses all the red black tree features, specifically the augment callback thats called on tree topology changes, and it poisons and checks entries as theyre removed from and inserted back into the tree respectively. ok stefan@
Diffstat (limited to 'sys/uvm/uvm_map.h')
-rw-r--r--sys/uvm/uvm_map.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/uvm/uvm_map.h b/sys/uvm/uvm_map.h
index 103e5e4f40b..1fdd72d60eb 100644
--- a/sys/uvm/uvm_map.h
+++ b/sys/uvm/uvm_map.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_map.h,v 1.56 2016/08/11 01:17:33 dlg Exp $ */
+/* $OpenBSD: uvm_map.h,v 1.57 2016/09/16 01:09:53 dlg Exp $ */
/* $NetBSD: uvm_map.h,v 1.24 2001/02/18 21:19:08 chs Exp $ */
/*
@@ -160,7 +160,7 @@ union vm_map_object {
*/
struct vm_map_entry {
union {
- RB_ENTRY(vm_map_entry) addr_entry; /* address tree */
+ RBT_ENTRY(vm_map_entry) addr_entry; /* address tree */
SLIST_ENTRY(vm_map_entry) addr_kentry;
} daddrs;
@@ -201,8 +201,8 @@ struct vm_map_entry {
#define VM_MAPENT_ISWIRED(entry) ((entry)->wired_count != 0)
TAILQ_HEAD(uvm_map_deadq, vm_map_entry); /* dead entry queue */
-RB_HEAD(uvm_map_addr, vm_map_entry);
-RB_PROTOTYPE(uvm_map_addr, vm_map_entry, daddrs.addr_entry,
+RBT_HEAD(uvm_map_addr, vm_map_entry);
+RBT_PROTOTYPE(uvm_map_addr, vm_map_entry, daddrs.addr_entry,
uvm_mapentry_addrcmp);
/*