summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1998-01-25 09:22:29 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1998-01-25 09:22:29 +0000
commitb29f00e9c92ef59258a036aa51c21ab5cc6a145c (patch)
treed05973f4d684221c742ce6e764558341d6e4521b /sys
parenta42b894f829aa680d42600770b0afeafb84566ba (diff)
Remove redundant splbio I added yesterday
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ccd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 5454f4d9990..b1dd42835f9 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccd.c,v 1.30 1998/01/24 22:53:49 niklas Exp $ */
+/* $OpenBSD: ccd.c,v 1.31 1998/01/25 09:22:28 niklas Exp $ */
/* $NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $ */
/*-
@@ -832,7 +832,7 @@ ccdbuffer(cs, bp, bn, addr, bcount, cbpp, old_io)
struct ccdcinfo *ci, *ci2 = NULL;
struct ccdbuf *cbp;
daddr_t cbn, cboff, sblk;
- int ccdisk, off, s;
+ int ccdisk, off;
long old_bcount, cnt;
struct ccdiinfo *ii;
struct buf *nbp;
@@ -927,10 +927,8 @@ ccdbuffer(cs, bp, bn, addr, bcount, cbpp, old_io)
nbp->b_data = addr;
else {
do {
- s = splbio();
nbp->b_data = (caddr_t)kmem_alloc_pageable(
ccdmap, bp->b_bcount);
- splx(s);
/*
* XXX Instead of sleeping, we might revert