diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-05-11 10:06:57 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-05-11 10:06:57 +0000 |
| commit | ebfc5f745f41b3eba34dc6307aab7d5aa969f2ed (patch) | |
| tree | f2e985dd112ef2955df413538b1f5bf30eb4e434 /sys/arch/vax/bi | |
| parent | cdb3ab5492ffd4d895cfd28b9d5f5839ea201ce4 (diff) | |
Don't use LK_CANRECURSE for the kernel lock, okay miod@ art@
Diffstat (limited to 'sys/arch/vax/bi')
| -rw-r--r-- | sys/arch/vax/bi/if_ni.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/bi/kdb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/vax/bi/if_ni.c b/sys/arch/vax/bi/if_ni.c index 29760c45872..cdd803754e3 100644 --- a/sys/arch/vax/bi/if_ni.c +++ b/sys/arch/vax/bi/if_ni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ni.c,v 1.9 2007/05/10 17:59:26 deraadt Exp $ */ +/* $OpenBSD: if_ni.c,v 1.10 2007/05/11 10:06:55 pedro Exp $ */ /* $NetBSD: if_ni.c,v 1.15 2002/05/22 16:03:14 wiz Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -596,7 +596,7 @@ niintr(void *arg) if ((NI_RREG(NI_PSR) & PSR_ERR)) printf("%s: PSR %x\n", sc->sc_dev.dv_xname, NI_RREG(NI_PSR)); - KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE); + KERNEL_LOCK(); /* Got any response packets? */ while ((NI_RREG(NI_PSR) & PSR_RSQ) && (data = REMQHI(&gvp->nc_forwr))) { diff --git a/sys/arch/vax/bi/kdb.c b/sys/arch/vax/bi/kdb.c index 6fb2415a3c5..26130c2e13a 100644 --- a/sys/arch/vax/bi/kdb.c +++ b/sys/arch/vax/bi/kdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdb.c,v 1.10 2007/05/10 17:59:26 deraadt Exp $ */ +/* $OpenBSD: kdb.c,v 1.11 2007/05/11 10:06:55 pedro Exp $ */ /* $NetBSD: kdb.c,v 1.26 2001/11/13 12:51:34 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -301,7 +301,7 @@ kdbintr(void *arg) kdbsaerror(&sc->sc_dev, 1); return; } - KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE); + KERNEL_LOCK(); mscp_intr(sc->sc_softc); KERNEL_UNLOCK(); } |