[src/trunk]: src/sys/external/bsd/drm2/include/linux Move struct rb_root from...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6728a113c465
branches:  trunk
changeset: 1027799:6728a113c465
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 00:46:44 2021 +0000

description:
Move struct rb_root from linux interval_tree.h to rbtree.h.

diffstat:

 sys/external/bsd/drm2/include/linux/interval_tree.h |  15 ++-------------
 sys/external/bsd/drm2/include/linux/rbtree.h        |  15 ++++++++++++++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diffs (56 lines):

diff -r 03fc47614837 -r 6728a113c465 sys/external/bsd/drm2/include/linux/interval_tree.h
--- a/sys/external/bsd/drm2/include/linux/interval_tree.h       Sun Dec 19 00:46:36 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/interval_tree.h       Sun Dec 19 00:46:44 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: interval_tree.h,v 1.8 2019/01/04 20:22:32 tnn Exp $    */
+/*     $NetBSD: interval_tree.h,v 1.9 2021/12/19 00:46:44 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,18 +32,7 @@
 #ifndef        _LINUX_INTERVAL_TREE_H_
 #define        _LINUX_INTERVAL_TREE_H_
 
-#include <sys/rbtree.h>
-
-struct rb_root {
-       struct rb_tree  rbr_tree;
-};
-
-static inline bool
-RB_EMPTY_ROOT(struct rb_root *root)
-{
-
-       return RB_TREE_MIN(&root->rbr_tree) == NULL;
-}
+#include <linux/rbtree.h>
 
 struct interval_tree_node {
        struct rb_node  itn_node;
diff -r 03fc47614837 -r 6728a113c465 sys/external/bsd/drm2/include/linux/rbtree.h
--- a/sys/external/bsd/drm2/include/linux/rbtree.h      Sun Dec 19 00:46:36 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/rbtree.h      Sun Dec 19 00:46:44 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbtree.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $     */
+/*     $NetBSD: rbtree.h,v 1.3 2021/12/19 00:46:44 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,4 +32,17 @@
 #ifndef _LINUX_RBTREE_H_
 #define _LINUX_RBTREE_H_
 
+#include <sys/rbtree.h>
+
+struct rb_root {
+       struct rb_tree  rbr_tree;
+};
+
+static inline bool
+RB_EMPTY_ROOT(struct rb_root *root)
+{
+
+       return RB_TREE_MIN(&root->rbr_tree) == NULL;
+}
+
 #endif  /* _LINUX_RBTREE_H_ */