[src/thorpej-futex2]: src/sys/kern merge rev. 1.15 from HEAD:

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f03c2d0b005a
branches:  thorpej-futex2
changeset: 990656:f03c2d0b005a
user:      chs <chs%NetBSD.org@localhost>
date:      Mon Nov 01 08:40:16 2021 +0000

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

diffstat:

 sys/kern/sys_futex.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 219e39de3a9e -r f03c2d0b005a sys/kern/sys_futex.c
--- a/sys/kern/sys_futex.c      Sat Aug 07 01:46:54 2021 +0000
+++ b/sys/kern/sys_futex.c      Mon Nov 01 08:40:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 @@
        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;
 }