aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2013-02-21 00:26:31 +0000
committerWarner Losh <imp@FreeBSD.org>2013-02-21 00:26:31 +0000
commit37270a177d8c215612973ae21f1bee31c6c3711c (patch)
tree927d4ebd2be5c9f711a47feb216681a5e2044921 /sys/dev
parent6ab6bfe32f39c069fd03940966b2dd56d6494851 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ppc/ppc_isa.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index 14424a3cc86dc..a40fc8e8ef368 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -141,7 +141,7 @@ ppc_isa_write(device_t dev, char *buf, int len, int how)
{
struct ppc_data *ppc = device_get_softc(dev);
char ecr, ecr_sav, ctr, ctr_sav;
- int s, error = 0;
+ int error = 0;
int spin;
PPC_ASSERT_LOCKED(ppc);
@@ -190,12 +190,6 @@ ppc_isa_write(device_t dev, char *buf, int len, int how)
w_ecr(ppc, ecr);
ecr = r_ecr(ppc);
- /* enter splhigh() not to be preempted
- * by the dma interrupt, we may miss
- * the wakeup otherwise
- */
- s = splhigh();
-
ppc->ppc_dmastat = PPC_DMA_INIT;
/* enable interrupts */
@@ -221,8 +215,6 @@ ppc_isa_write(device_t dev, char *buf, int len, int how)
"ppcdma", 0);
} while (error == EWOULDBLOCK);
- splx(s);
-
if (error) {
#ifdef PPC_DEBUG
printf("i");