Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/src/rev/c8e0e47f72e3
branches:  netbsd-10
changeset: 373626:c8e0e47f72e3
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Feb 22 19:54:30 2023 +0000

description:
Pull up following revision(s) (requested by thorpej in ticket #101):

        sys/kern/kern_time.c: revision 1.219

In itimer_arm_real(), KASSERT that it->it_dying is false.  This was
already implicitly assumed, but make it explicit in hopes of tracking
down kern/57226.

diffstat:

 sys/kern/kern_time.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r e705c09b5090 -r c8e0e47f72e3 sys/kern/kern_time.c
--- a/sys/kern/kern_time.c      Wed Feb 22 19:07:09 2023 +0000
+++ b/sys/kern/kern_time.c      Wed Feb 22 19:54:30 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_time.c,v 1.218 2022/10/26 23:23:52 riastradh Exp $        */
+/*     $NetBSD: kern_time.c,v 1.218.2.1 2023/02/22 19:54:30 martin Exp $       */
 
 /*-
  * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009, 2020
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.218 2022/10/26 23:23:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.218.2.1 2023/02/22 19:54:30 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/resourcevar.h>
@@ -809,6 +809,8 @@
 static void
 itimer_arm_real(struct itimer * const it)
 {
+       KASSERT(!it->it_dying);
+
        /*
         * Don't need to check tshzto() return value, here.
         * callout_reset() does it for us.



Home | Main Index | Thread Index | Old Index