Module Name: src
Committed By: christos
Date: Fri Jan 12 17:58:51 UTC 2018
Modified Files:
src/sys/kern: kern_event.c
Log Message:
Set EV_ONESHOT to prevent rescheduling
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/kern/kern_event.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_event.c
diff -u src/sys/kern/kern_event.c:1.102 src/sys/kern/kern_event.c:1.103
--- src/sys/kern/kern_event.c:1.102 Mon Jan 8 22:31:13 2018
+++ src/sys/kern/kern_event.c Fri Jan 12 12:58:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.102 2018/01/09 03:31:13 christos Exp $ */
+/* $NetBSD: kern_event.c,v 1.103 2018/01/12 17:58:51 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.102 2018/01/09 03:31:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.103 2018/01/12 17:58:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -710,6 +710,12 @@ static void
filt_timerdetach(struct knote *kn)
{
callout_t *calloutp;
+ struct kqueue *kq = kn->kn_kq;
+
+ mutex_spin_enter(&kq->kq_lock);
+ /* prevent rescheduling when we expire */
+ kn->kn_flags |= EV_ONESHOT;
+ mutex_spin_exit(&kq->kq_lock);
calloutp = (callout_t *)kn->kn_hook;
callout_halt(calloutp, NULL);
