[src/netbsd-9]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/7eb924fe17fd
branches:  netbsd-9
changeset: 843490:7eb924fe17fd
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 11 17:20:00 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #416):

        sys/arch/x86/x86/intr.c: revision 1.147

 Fix a bug that evcnt_detach() called twice when the idt vector is full.

OK'd by knakahara.

diffstat:

 sys/arch/x86/x86/intr.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r dd2ff7d1d83b -r 7eb924fe17fd sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Mon Nov 11 17:15:42 2019 +0000
+++ b/sys/arch/x86/x86/intr.c   Mon Nov 11 17:20:00 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.146 2019/06/17 06:38:30 msaitoh Exp $       */
+/*     $NetBSD: intr.c,v 1.146.2.1 2019/11/11 17:20:00 martin Exp $    */
 
 /*
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.146 2019/06/17 06:38:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.146.2.1 2019/11/11 17:20:00 martin Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -475,8 +475,10 @@
        SIMPLEQ_REMOVE(&io_interrupt_sources, isp, intrsource, is_list);
 
        /* Is this interrupt established? */
-       if (isp->is_evname[0] != '\0')
+       if (isp->is_evname[0] != '\0') {
                evcnt_detach(&isp->is_evcnt);
+               isp->is_evname[0] = '\0';
+       }
 
        kmem_free(isp->is_saved_evcnt,
            sizeof(*(isp->is_saved_evcnt)) * ncpu);
@@ -679,6 +681,7 @@
        }
        if (idtvec == 0) {
                evcnt_detach(&ci->ci_isources[slot]->is_evcnt);
+               ci->ci_isources[slot]->is_evname[0] = '\0';
                ci->ci_isources[slot] = NULL;
                return EBUSY;
        }