Module Name: src
Committed By: riastradh
Date: Sat Nov 11 17:02:53 UTC 2017
Modified Files:
src/sys/arch/xen/xen: evtchn.c
Log Message:
Back out previous KASSERTMSG for now.
The immediate problem appears to have been elsewhere, in the wrong
interrupt level passed by the Xen-specific intr_establish to
event_set_handler.
We should maybe restore these assertions later, but at least one was
violated before cherry's interrupt rototill anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/xen/xen/evtchn.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/arch/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.77 src/sys/arch/xen/xen/evtchn.c:1.78
--- src/sys/arch/xen/xen/evtchn.c:1.77 Sat Nov 11 08:23:50 2017
+++ src/sys/arch/xen/xen/evtchn.c Sat Nov 11 17:02:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.77 2017/11/11 08:23:50 riastradh Exp $ */
+/* $NetBSD: evtchn.c,v 1.78 2017/11/11 17:02:53 riastradh Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.77 2017/11/11 08:23:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.78 2017/11/11 17:02:53 riastradh Exp $");
#include "opt_xen.h"
#include "isa.h"
@@ -386,11 +386,6 @@ evtchn_do_event(int evtch, struct intrfr
ci->ci_ilevel = ih->ih_level;
ih_fun = (void *)ih->ih_fun;
ih_fun(ih->ih_arg, regs);
- KASSERTMSG(ci->ci_ilevel == ih->ih_level,
- "event handler %p for evtsource[%d] (%s) changed ipl:"
- " %d != %d",
- ih->ih_realfun, evtch, evtsource[evtch]->ev_evname,
- ci->ci_ilevel, ih->ih_level);
ih = ih->ih_evt_next;
}
mutex_spin_exit(&evtlock[evtch]);
@@ -415,13 +410,6 @@ splx:
sti();
ih_fun = (void *)ih->ih_fun;
ih_fun(ih->ih_arg, regs);
- KASSERTMSG(ci->ci_ilevel == i,
- "interrupt handler %p"
- " for interrupt source %s"
- " changed ipl: %d != %d",
- ih->ih_realfun,
- ci->ci_isources[i]->is_xname,
- ci->ci_ilevel, i);
cli();
}
hypervisor_enable_ipl(i);
