summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2000-10-08 14:37:39 +0000
committerbde <bde@FreeBSD.org>2000-10-08 14:37:39 +0000
commited400ce5be0c1e1a2a1f2dc97f008f46ab27b941 (patch)
treed72729d03401d037dc9baa3d722effd59fdc8b91 /sys
parent9a732eea7b3b28863c38293c4ff3ef6bdec330bc (diff)
downloadFreeBSD-src-ed400ce5be0c1e1a2a1f2dc97f008f46ab27b941.zip
FreeBSD-src-ed400ce5be0c1e1a2a1f2dc97f008f46ab27b941.tar.gz
Use schedsofttty() again (SMPng casualty with intentionally wrong fix
in rev.1.101). Made this file compile again after move of stuff from <machine.ipl.h> to <sys/ipl.h>.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/cy/cy.c6
-rw-r--r--sys/dev/cy/cy_isa.c6
-rw-r--r--sys/i386/isa/cy.c6
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index b3b68b5..8524228c 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -76,11 +76,11 @@
#include <sys/fcntl.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
+#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <machine/clock.h>
-#include <machine/ipl.h>
#ifndef SMP
#include <machine/lock.h>
#endif
@@ -1582,11 +1582,7 @@ terminate_tx_service:
/* ensure an edge for the next interrupt */
cy_outb(cy_iobase, CY_CLEAR_INTR, cy_align, 0);
-#if 0
schedsofttty();
-#else
- panic("Fix the i386/isa/cy.c files call to schedsofttty()");
-#endif
COM_UNLOCK();
}
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index b3b68b5..8524228c 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -76,11 +76,11 @@
#include <sys/fcntl.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
+#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <machine/clock.h>
-#include <machine/ipl.h>
#ifndef SMP
#include <machine/lock.h>
#endif
@@ -1582,11 +1582,7 @@ terminate_tx_service:
/* ensure an edge for the next interrupt */
cy_outb(cy_iobase, CY_CLEAR_INTR, cy_align, 0);
-#if 0
schedsofttty();
-#else
- panic("Fix the i386/isa/cy.c files call to schedsofttty()");
-#endif
COM_UNLOCK();
}
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index b3b68b5..8524228c 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -76,11 +76,11 @@
#include <sys/fcntl.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
+#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <machine/clock.h>
-#include <machine/ipl.h>
#ifndef SMP
#include <machine/lock.h>
#endif
@@ -1582,11 +1582,7 @@ terminate_tx_service:
/* ensure an edge for the next interrupt */
cy_outb(cy_iobase, CY_CLEAR_INTR, cy_align, 0);
-#if 0
schedsofttty();
-#else
- panic("Fix the i386/isa/cy.c files call to schedsofttty()");
-#endif
COM_UNLOCK();
}
OpenPOWER on IntegriCloud