Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:46:44 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: interval_tree.h rbtree.h
Log Message:
Move struct rb_root from linux interval_tree.h to rbtree.h.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/include/linux/interval_tree.h
cvs rdiff -u -r1.2 -r1.3 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.8 src/sys/external/bsd/drm2/include/linux/interval_tree.h:1.9
--- src/sys/external/bsd/drm2/include/linux/interval_tree.h:1.8 Fri Jan 4 20:22:32 2019
+++ src/sys/external/bsd/drm2/include/linux/interval_tree.h Sun Dec 19 00:46:44 2021
@@ -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;
Index: src/sys/external/bsd/drm2/include/linux/rbtree.h
diff -u src/sys/external/bsd/drm2/include/linux/rbtree.h:1.2 src/sys/external/bsd/drm2/include/linux/rbtree.h:1.3
--- src/sys/external/bsd/drm2/include/linux/rbtree.h:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/external/bsd/drm2/include/linux/rbtree.h Sun Dec 19 00:46:44 2021
@@ -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_ */
