[src/trunk]: src/sys/kern revert kern_softint.c:r1.42 (which was incorrect fix)

[knakahara <knakahara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5de874748480
branches:  trunk
changeset: 346259:5de874748480
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Jul 04 04:20:14 2016 +0000

description:
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

diffstat:

 sys/kern/kern_softint.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r ac5886f64099 -r 5de874748480 sys/kern/kern_softint.c
--- a/sys/kern/kern_softint.c   Mon Jul 04 04:17:25 2016 +0000
+++ b/sys/kern/kern_softint.c   Mon Jul 04 04:20:14 2016 +0000
@@ -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 @@
                        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. */