Module Name: src
Committed By: riastradh
Date: Sat Jul 29 23:50:03 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/linux: linux_ww_mutex.c
Log Message:
drm/linux_ww_mutex: Fix ww acquire context ordering.
XXX pullup-8
XXX pullup-9
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/linux/linux_ww_mutex.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/linux/linux_ww_mutex.c
diff -u src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.15 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.16
--- src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.15 Sat Jul 29 22:43:56 2023
+++ src/sys/external/bsd/drm2/linux/linux_ww_mutex.c Sat Jul 29 23:50:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ww_mutex.c,v 1.15 2023/07/29 22:43:56 riastradh Exp $ */
+/* $NetBSD: linux_ww_mutex.c,v 1.16 2023/07/29 23:50:03 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.15 2023/07/29 22:43:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.16 2023/07/29 23:50:03 riastradh Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -62,7 +62,7 @@ ww_acquire_ctx_compare(void *cookie __un
if (ctx_a->wwx_ticket < ctx_b->wwx_ticket)
return -1;
if (ctx_a->wwx_ticket > ctx_b->wwx_ticket)
- return -1;
+ return +1;
return 0;
}
@@ -76,7 +76,7 @@ ww_acquire_ctx_compare_key(void *cookie
if (ctx->wwx_ticket < ticket)
return -1;
if (ctx->wwx_ticket > ticket)
- return -1;
+ return +1;
return 0;
}
