Module Name: src
Committed By: martin
Date: Wed Feb 22 19:54:30 UTC 2023
Modified Files:
src/sys/kern [netbsd-10]: kern_time.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.218.2.1 src/sys/kern/kern_time.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/kern_time.c
diff -u src/sys/kern/kern_time.c:1.218 src/sys/kern/kern_time.c:1.218.2.1
--- src/sys/kern/kern_time.c:1.218 Wed Oct 26 23:23:52 2022
+++ src/sys/kern/kern_time.c Wed Feb 22 19:54:30 2023
@@ -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_callout(void *);
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.
