Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:45:13 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: rbtree.h
Log Message:
linux: Fix rbtree node/element confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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/rbtree.h
diff -u src/sys/external/bsd/drm2/include/linux/rbtree.h:1.12 src/sys/external/bsd/drm2/include/linux/rbtree.h:1.13
--- src/sys/external/bsd/drm2/include/linux/rbtree.h:1.12 Sun Dec 19 11:19:24 2021
+++ src/sys/external/bsd/drm2/include/linux/rbtree.h Sun Dec 19 11:45:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtree.h,v 1.12 2021/12/19 11:19:24 riastradh Exp $ */
+/* $NetBSD: rbtree.h,v 1.13 2021/12/19 11:45:13 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -69,9 +69,12 @@ rb_first(struct rb_root *root)
}
static inline struct rb_node *
-rb_next2(struct rb_root *root, struct rb_node *rb)
+rb_next2(struct rb_root *root, struct rb_node *rbnode)
{
- return RB_TREE_NEXT(&root->rbr_tree, rb);
+ char *vnode = (char *)rbnode;
+
+ vnode -= root->rbr_tree.rbt_ops->rbto_node_offset;
+ return RB_TREE_NEXT(&root->rbr_tree, vnode);
}
static inline struct rb_node *
