Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:33:11 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: interval_tree_generic.h
Log Message:
drm: Fix an even number of sign errors in interval_tree_generic.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/include/linux/interval_tree_generic.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_generic.h
diff -u src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h:1.4 src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h:1.5
--- src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h:1.4 Sun Dec 19 12:22:28 2021
+++ src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h Sun Dec 19 12:33:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: interval_tree_generic.h,v 1.4 2021/12/19 12:22:28 riastradh Exp $ */
+/* $NetBSD: interval_tree_generic.h,v 1.5 2021/12/19 12:33:11 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,6 +32,10 @@
#ifndef _LINUX_INTERVAL_TREE_GENERIC_H_
#define _LINUX_INTERVAL_TREE_GENERIC_H_
+/* XXX See interval_tree.h for warnings. */
+
+#include <sys/rbtree.h>
+
#define INTERVAL_TREE_DEFINE(T, F, KT, KLAST, NSTART, NLAST, QUAL, PREFIX) \
\
static inline int \
@@ -49,7 +53,7 @@ PREFIX##__compare_nodes(void *__cookie,
if (__alast < __blast) \
return -1; \
if (__alast > __blast) \
- return -1; \
+ return +1; \
return 0; \
} \
\
@@ -103,7 +107,7 @@ PREFIX##_iter_first(struct rb_root_cache
__node = rb_tree_find_node_geq(&__root->rb_root.rbr_tree, &__start); \
if (__node == NULL) \
return NULL; \
- KASSERT(START(__node) <= __start); \
+ KASSERT(__start <= START(__node)); \
if (__last < START(__node)) \
return NULL; \
\
