Pull up following revision(s) (requested by riastradh in ticket #1694):

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

drm/linux_ww_mutex: Fix ww acquire context ordering.
This commit is contained in:
martin 2023-08-01 16:56:55 +00:00
parent 764d104173
commit 98824fcce3
1 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_ww_mutex.c,v 1.7 2019/05/09 05:00:31 ozaki-r Exp $ */
/* $NetBSD: linux_ww_mutex.c,v 1.7.2.1 2023/08/01 16:56:55 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.7 2019/05/09 05:00:31 ozaki-r Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.7.2.1 2023/08/01 16:56:55 martin Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@ -62,7 +62,7 @@ ww_acquire_ctx_compare(void *cookie __unused, const void *va, const void *vb)
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 __unused, const void *vn,
if (ctx->wwx_ticket < ticket)
return -1;
if (ctx->wwx_ticket > ticket)
return -1;
return +1;
return 0;
}