details: https://anonhg.NetBSD.org/src/rev/b32039282785
branches: netbsd-8
changeset: 461066:b32039282785
user: martin <martin%NetBSD.org@localhost>
date: Thu Nov 14 15:58:06 2019 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #1437):
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 9747d6230bdb -r b32039282785 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c Thu Nov 14 15:55:59 2019 +0000
+++ b/sys/arch/x86/x86/intr.c Thu Nov 14 15:58:06 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.101.2.6 2019/03/09 17:10:19 martin Exp $ */
+/* $NetBSD: intr.c,v 1.101.2.7 2019/11/14 15:58:06 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.101.2.6 2019/03/09 17:10:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101.2.7 2019/11/14 15:58:06 martin Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -591,8 +591,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);
@@ -782,6 +784,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;
}