Module Name: src
Committed By: yamt
Date: Tue Apr 5 00:27:36 UTC 2011
Modified Files:
src/sys/kern: kern_time.c
Log Message:
fix assertion failure in timer_intr. CLOCK_REALTIME timers can be on
timer_queue.
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 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.166 src/sys/kern/kern_time.c:1.167
--- src/sys/kern/kern_time.c:1.166 Fri Dec 17 22:08:18 2010
+++ src/sys/kern/kern_time.c Tue Apr 5 00:27:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.166 2010/12/17 22:08:18 yamt Exp $ */
+/* $NetBSD: kern_time.c,v 1.167 2011/04/05 00:27:35 yamt Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.166 2010/12/17 22:08:18 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.167 2011/04/05 00:27:35 yamt Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -1282,7 +1282,7 @@
pts->pts_timers[index] = NULL;
if (pt->pt_type == CLOCK_REALTIME)
callout_halt(&pt->pt_ch, &timer_lock);
- else if (pt->pt_queued)
+ if (pt->pt_queued)
TAILQ_REMOVE(&timer_queue, pt, pt_chain);
mutex_spin_exit(&timer_lock);
if (pt->pt_type == CLOCK_REALTIME)
