Module Name: src
Committed By: knakahara
Date: Mon Jul 4 04:20:14 UTC 2016
Modified Files:
src/sys/kern: kern_softint.c
Log Message:
revert kern_softint.c:r1.42 (which was incorrect fix)
gif(4) has violated softint(9) contract. That is fixed by previous 2 commits.
see:
https://mail-index.netbsd.org/tech-kern/2016/01/12/msg019993.html
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/kern_softint.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_softint.c
diff -u src/sys/kern/kern_softint.c:1.42 src/sys/kern/kern_softint.c:1.43
--- src/sys/kern/kern_softint.c:1.42 Thu Dec 24 02:27:14 2015
+++ src/sys/kern/kern_softint.c Mon Jul 4 04:20:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_softint.c,v 1.42 2015/12/24 02:27:14 knakahara Exp $ */
+/* $NetBSD: kern_softint.c,v 1.43 2016/07/04 04:20:14 knakahara Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.42 2015/12/24 02:27:14 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.43 2016/07/04 04:20:14 knakahara Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -442,8 +442,8 @@ softint_disestablish(void *arg)
KASSERT(sh->sh_func != NULL);
flags |= sh->sh_flags;
}
- /* Neither pending nor active on all CPUs? */
- if ((flags & (SOFTINT_PENDING | SOFTINT_ACTIVE)) == 0) {
+ /* Inactive on all CPUs? */
+ if ((flags & SOFTINT_ACTIVE) == 0) {
break;
}
/* Oops, still active. Wait for it to clear. */
