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

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Jan 16 13:26:12 UTC 2018

Modified Files:
        src/sys/kern [netbsd-8]: kern_event.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #501):
        sys/kern/kern_event.c: revision 1.103
Set EV_ONESHOT to prevent rescheduling
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.91.2.1 -r1.91.2.2 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.91.2.1 src/sys/kern/kern_event.c:1.91.2.2
--- src/sys/kern/kern_event.c:1.91.2.1	Wed Jul  5 20:04:40 2017
+++ src/sys/kern/kern_event.c	Tue Jan 16 13:26:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_event.c,v 1.91.2.1 2017/07/05 20:04:40 snj Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.91.2.2 2018/01/16 13:26:12 martin 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.91.2.1 2017/07/05 20:04:40 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.91.2.2 2018/01/16 13:26:12 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -662,6 +662,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);