[src/trunk]: src/sys/arch/x86/x86 Fix a bug that evcnt_detach() called twice ...

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

details:   https://anonhg.NetBSD.org/src/rev/651228f263ba
branches:  trunk
changeset: 460892:651228f263ba
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Nov 08 04:15:02 2019 +0000

description:
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 cabc02b60c3c -r 651228f263ba sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Fri Nov 08 00:35:16 2019 +0000
+++ b/sys/arch/x86/x86/intr.c   Fri Nov 08 04:15:02 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.147 2019/11/08 04:15:02 msaitoh 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.147 2019/11/08 04:15:02 msaitoh 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;
        }