From db8ec2a2442b5530bc0d445369f1cbc373e528d4 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 8 Oct 2000 14:37:39 +0000
Subject: [PATCH] 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>.
---
 sys/dev/cy/cy.c     | 6 +-----
 sys/dev/cy/cy_isa.c | 6 +-----
 sys/i386/isa/cy.c   | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index b3b68b5912c..8524228cb3b 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 b3b68b5912c..8524228cb3b 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 b3b68b5912c..8524228cb3b 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();
 }