Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:44:33 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: interval_tree.h rbtree.h
Log Message:
Move rbtree_postorder_for_each_entry_safe to linux/rbtree.h.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/include/linux/interval_tree.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/linux/rbtree.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/interval_tree.h
diff -u src/sys/external/bsd/drm2/include/linux/interval_tree.h:1.9 src/sys/external/bsd/drm2/include/linux/interval_tree.h:1.10
--- src/sys/external/bsd/drm2/include/linux/interval_tree.h:1.9 Sun Dec 19 00:46:44 2021
+++ src/sys/external/bsd/drm2/include/linux/interval_tree.h Sun Dec 19 01:44:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: interval_tree.h,v 1.9 2021/12/19 00:46:44 riastradh Exp $ */
+/* $NetBSD: interval_tree.h,v 1.10 2021/12/19 01:44:33 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -137,16 +137,4 @@ interval_tree_iter_next(struct rb_root *
return next;
}
-/*
- * XXX This is not actually postorder, but I can't fathom why you would
- * want postorder for an ordered tree; different insertion orders lead
- * to different traversal orders.
- */
-#define rbtree_postorder_for_each_entry_safe(NODE, TMP, ROOT, FIELD) \
- for ((NODE) = RB_TREE_MIN(&(ROOT)->rbr_tree); \
- ((NODE) != NULL && \
- ((TMP) = rb_tree_iterate(&(ROOT)->rbr_tree, (NODE), \
- RB_DIR_RIGHT))); \
- (NODE) = (TMP))
-
#endif /* _LINUX_INTERVAL_TREE_H_ */
Index: src/sys/external/bsd/drm2/include/linux/rbtree.h
diff -u src/sys/external/bsd/drm2/include/linux/rbtree.h:1.6 src/sys/external/bsd/drm2/include/linux/rbtree.h:1.7
--- src/sys/external/bsd/drm2/include/linux/rbtree.h:1.6 Sun Dec 19 01:44:26 2021
+++ src/sys/external/bsd/drm2/include/linux/rbtree.h Sun Dec 19 01:44:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtree.h,v 1.6 2021/12/19 01:44:26 riastradh Exp $ */
+/* $NetBSD: rbtree.h,v 1.7 2021/12/19 01:44:33 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -64,4 +64,16 @@ rb_erase_cached(struct rb_node *rbnode,
rb_erase(rbnode, &root->rbrc_root);
}
+/*
+ * XXX This is not actually postorder, but I can't fathom why you would
+ * want postorder for an ordered tree; different insertion orders lead
+ * to different traversal orders.
+ */
+#define rbtree_postorder_for_each_entry_safe(NODE, TMP, ROOT, FIELD) \
+ for ((NODE) = RB_TREE_MIN(&(ROOT)->rbr_tree); \
+ ((NODE) != NULL && \
+ ((TMP) = rb_tree_iterate(&(ROOT)->rbr_tree, (NODE), \
+ RB_DIR_RIGHT))); \
+ (NODE) = (TMP))
+
#endif /* _LINUX_RBTREE_H_ */
