CVS commit: [netbsd-9] src/sys/kern

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Wed Jul 15 13:30:20 UTC 2020

Modified Files:
        src/sys/kern [netbsd-9]: subr_percpu.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.14.1 src/sys/kern/subr_percpu.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/subr_percpu.c
diff -u src/sys/kern/subr_percpu.c:1.18 src/sys/kern/subr_percpu.c:1.18.14.1
--- src/sys/kern/subr_percpu.c:1.18	Wed May 31 23:54:17 2017
+++ src/sys/kern/subr_percpu.c	Wed Jul 15 13:30:20 2020
@@ -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 @@ percpu_cpu_enlarge(size_t size)
 			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);
 		}