[src/netbsd-9]: src/sys/kern Pull up following revision(s) (requested by rias...

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

details:   https://anonhg.NetBSD.org/src/rev/f3297dc5802d
branches:  netbsd-9
changeset: 964008:f3297dc5802d
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jul 15 13:30:20 2020 +0000

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

        sys/kern/subr_percpu.c: revision 1.20

Allow equality in this assertion.


This can happen if we lose the race mentioned in percpu_cpu_swap.

diffstat:

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

diffs (27 lines):

diff -r 35d890d5cc3d -r f3297dc5802d sys/kern/subr_percpu.c
--- a/sys/kern/subr_percpu.c    Tue Jul 14 13:38:12 2020 +0000
+++ b/sys/kern/subr_percpu.c    Wed Jul 15 13:30:20 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_percpu.c,v 1.18 2017/05/31 23:54:17 chs Exp $     */
+/*     $NetBSD: subr_percpu.c,v 1.18.14.1 2020/07/15 13:30:20 martin Exp $     */
 
 /*-
  * Copyright (c)2007,2008 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.18 2017/05/31 23:54:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.18.14.1 2020/07/15 13:30:20 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -149,7 +149,7 @@
                        where = xc_unicast(0, percpu_cpu_swap, ci, &pcc, ci);
                        xc_wait(where);
                }
-               KASSERT(pcc.pcc_size < size);
+               KASSERT(pcc.pcc_size <= size);
                if (pcc.pcc_data != NULL) {
                        kmem_free(pcc.pcc_data, pcc.pcc_size);
                }