CVS commit: [netbsd-10] src/sys/external/bsd/drm2/linux

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Aug  1 16:55:03 UTC 2023

Modified Files:
        src/sys/external/bsd/drm2/linux [netbsd-10]: linux_ww_mutex.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #299):

        sys/external/bsd/drm2/linux/linux_ww_mutex.c: revision 1.16

drm/linux_ww_mutex: Fix ww acquire context ordering.


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 \
    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.14.4.1 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.14.4.2
--- src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.14.4.1	Tue Aug  1 16:53:18 2023
+++ src/sys/external/bsd/drm2/linux/linux_ww_mutex.c	Tue Aug  1 16:55:03 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_ww_mutex.c,v 1.14.4.1 2023/08/01 16:53:18 martin Exp $	*/
+/*	$NetBSD: linux_ww_mutex.c,v 1.14.4.2 2023/08/01 16:55:03 martin 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.14.4.1 2023/08/01 16:53:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.14.4.2 2023/08/01 16:55:03 martin 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;
 }