diff options
| author | riastradh <riastradh@NetBSD.org> | 2021-12-19 00:46:44 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2021-12-19 00:46:44 +0000 |
| commit | 0fd621706e31328126245c01bdeb1e5a58c0718c (patch) | |
| tree | 73a58b042a024a5aae187a6f9aa7d449efc5950e /sys/external/bsd/drm2/include/linux | |
| parent | 2655e92c576864f3f7365654286a21be4699e75f (diff) | |
Move struct rb_root from linux interval_tree.h to rbtree.h.
Diffstat (limited to 'sys/external/bsd/drm2/include/linux')
| -rw-r--r-- | sys/external/bsd/drm2/include/linux/interval_tree.h | 15 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/include/linux/rbtree.h | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sys/external/bsd/drm2/include/linux/interval_tree.h b/sys/external/bsd/drm2/include/linux/interval_tree.h index caa56530cee..0dfd3f910b8 100644 --- a/sys/external/bsd/drm2/include/linux/interval_tree.h +++ b/sys/external/bsd/drm2/include/linux/interval_tree.h @@ -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 --git a/sys/external/bsd/drm2/include/linux/rbtree.h b/sys/external/bsd/drm2/include/linux/rbtree.h index e3605b7947b..d7ddc390eda 100644 --- a/sys/external/bsd/drm2/include/linux/rbtree.h +++ b/sys/external/bsd/drm2/include/linux/rbtree.h @@ -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_ */ |
