Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:12:39 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_active.c
Log Message:
i915: Allow duplicates in active tree, sorted by kva.
Upstream looks like it uses insertion order, but that's not really
convenient.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c
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/dist/drm/i915/i915_active.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.8 Sun Dec 19 12:11:14 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Sun Dec 19 12:12:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_active.c,v 1.8 2021/12/19 12:11:14 riastradh Exp $ */
+/* $NetBSD: i915_active.c,v 1.9 2021/12/19 12:12:39 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.8 2021/12/19 12:11:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.9 2021/12/19 12:12:39 riastradh Exp $");
#include <linux/debugobjects.h>
@@ -143,6 +143,10 @@ compare_nodes(void *cookie, const void *
return -1;
if (a->timeline > b->timeline)
return +1;
+ if ((uintptr_t)a < (uintptr_t)b)
+ return -1;
+ if ((uintptr_t)a > (uintptr_t)b)
+ return +1;
return 0;
}
