diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-07-04 07:47:44 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-07-04 07:47:44 +0000 |
commit | 012d0237c93a3b5eb0a8e8c62ee8eff4d6648f3a (patch) | |
tree | 21ceb4af1a0388c84ba12b6378335e5e43ec09d5 /sys/dev/ic | |
parent | b1ba19d1997028f7915c9e6c914c04ad0de0ac07 (diff) |
Remove orphaned splbios that have no matching splx,
this has been a problem since internal xfer queues got
removed back in 2008.
ok matthew@ krw@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r-- | sys/dev/ic/adv.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/bha.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index ae2ef0e0215..7ac7ddd5a5c 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv.c,v 1.34 2011/04/03 12:42:36 krw Exp $ */ +/* $OpenBSD: adv.c,v 1.35 2011/07/04 07:47:43 jsg Exp $ */ /* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */ /* @@ -543,9 +543,7 @@ adv_scsi_cmd(xs) ASC_SOFTC *sc = sc_link->adapter_softc; bus_dma_tag_t dmat = sc->sc_dmat; ADV_CCB *ccb; - int s, flags, error, nsegs; - - s = splbio(); /* protect the queue */ + int flags, error, nsegs; /* * get a ccb to use. If the transfer diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c index 4639c145312..8e71b070cad 100644 --- a/sys/dev/ic/bha.c +++ b/sys/dev/ic/bha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bha.c,v 1.28 2011/04/16 02:44:46 krw Exp $ */ +/* $OpenBSD: bha.c,v 1.29 2011/07/04 07:47:42 jsg Exp $ */ /* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */ #undef BHADEBUG @@ -1248,8 +1248,6 @@ bha_scsi_cmd(xs) SC_DEBUG(sc_link, SDEV_DB2, ("bha_scsi_cmd\n")); - s = splbio(); /* protect the queue */ - /* * get a ccb to use. If the transfer * is from a buf (possibly from interrupt time) |