Module Name: src
Committed By: skrll
Date: Wed Oct 29 10:47:46 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_com.c
Log Message:
Mark comintr as MP safe; otherwise a MULTIPROCESSOR kernel will try to
take the kernel_lock which breaks the locking protocol (should only be
taken at IPL_VM)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/allwinner/awin_com.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/arm/allwinner/awin_com.c
diff -u src/sys/arch/arm/allwinner/awin_com.c:1.6 src/sys/arch/arm/allwinner/awin_com.c:1.7
--- src/sys/arch/arm/allwinner/awin_com.c:1.6 Wed Oct 15 23:29:46 2014
+++ src/sys/arch/arm/allwinner/awin_com.c Wed Oct 29 10:47:46 2014
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_com.c,v 1.6 2014/10/15 23:29:46 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_com.c,v 1.7 2014/10/29 10:47:46 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -168,7 +168,7 @@ awin_com_attach(device_t parent, device_
KASSERT(loc->loc_intr != AWINIO_INTR_DEFAULT);
asc->asc_ih = intr_establish(loc->loc_intr, IPL_SERIAL,
- IST_EDGE /* | IST_MPSAFE */, comintr, sc);
+ IST_EDGE | IST_MPSAFE, comintr, sc);
if (asc->asc_ih == NULL)
panic("%s: failed to establish interrupt %d",
device_xname(self), loc->loc_intr);
