CVS commit: [thorpej-futex2] src/sys/kern

2021-11-01 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Mon Nov  1 08:40:16 UTC 2021

Modified Files:
src/sys/kern [thorpej-futex2]: sys_futex.c

Log Message:
merge rev. 1.15 from HEAD:
fix a typo in compare_futex_key().


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.5 -r1.12.4.6 src/sys/kern/sys_futex.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/kern/sys_futex.c
diff -u src/sys/kern/sys_futex.c:1.12.4.5 src/sys/kern/sys_futex.c:1.12.4.6
--- src/sys/kern/sys_futex.c:1.12.4.5	Sat Aug  7 01:22:33 2021
+++ src/sys/kern/sys_futex.c	Mon Nov  1 08:40:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_futex.c,v 1.12.4.5 2021/08/07 01:22:33 thorpej Exp $	*/
+/*	$NetBSD: sys_futex.c,v 1.12.4.6 2021/11/01 08:40:16 chs Exp $	*/
 
 /*-
  * Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.12.4.5 2021/08/07 01:22:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.12.4.6 2021/11/01 08:40:16 chs Exp $");
 
 /*
  * Futexes
@@ -299,7 +299,7 @@ compare_futex_key(void *cookie, const vo
 	if (fka->fk_private.va < fkb->fk_private.va)
 		return -1;
 	if (fka->fk_private.va > fkb->fk_private.va)
-		return -1;
+		return +1;
 	return 0;
 }
 



CVS commit: [thorpej-futex2] src/sys/kern

2021-11-01 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Mon Nov  1 08:40:16 UTC 2021

Modified Files:
src/sys/kern [thorpej-futex2]: sys_futex.c

Log Message:
merge rev. 1.15 from HEAD:
fix a typo in compare_futex_key().


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.5 -r1.12.4.6 src/sys/kern/sys_futex.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.