From fbc9c4f0425af3613ff0e70b25a37785d02e605f Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 25 Oct 2000 21:24:08 +0000
Subject: [PATCH] Catch up to the new software interrupt code.

Noticed by:	phk
---
 sys/dev/rc/rc.c   | 7 ++++---
 sys/i386/isa/rc.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index fc35bd5d3e72..11da8ac39bd9 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -39,6 +39,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
@@ -184,7 +185,7 @@ static int  rc_modctl           __P((struct rc_chans *, int, int));
 static void rc_start            __P((struct tty *));
 static void rc_stop              __P((struct tty *, int rw));
 static int  rc_param            __P((struct tty *, struct termios *));
-static swihand_t rcpoll;
+static void rcpoll		__P((void *));
 static void rc_reinit           __P((struct rc_softc *));
 #ifdef RCDEBUG
 static void printrcflags();
@@ -559,7 +560,7 @@ out:
 }
 
 /* Handle delayed events. */
-void rcpoll()
+void rcpoll(void *arg)
 {
 	register struct rc_chans *rc;
 	register struct rc_softc *rcb;
@@ -1423,7 +1424,7 @@ rc_wakeup(chan)
 		int	s;
 
 		s = splsofttty();
-		rcpoll();
+		rcpoll(NULL);
 		splx(s);
 	}
 }
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index fc35bd5d3e72..11da8ac39bd9 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -39,6 +39,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
@@ -184,7 +185,7 @@ static int  rc_modctl           __P((struct rc_chans *, int, int));
 static void rc_start            __P((struct tty *));
 static void rc_stop              __P((struct tty *, int rw));
 static int  rc_param            __P((struct tty *, struct termios *));
-static swihand_t rcpoll;
+static void rcpoll		__P((void *));
 static void rc_reinit           __P((struct rc_softc *));
 #ifdef RCDEBUG
 static void printrcflags();
@@ -559,7 +560,7 @@ out:
 }
 
 /* Handle delayed events. */
-void rcpoll()
+void rcpoll(void *arg)
 {
 	register struct rc_chans *rc;
 	register struct rc_softc *rcb;
@@ -1423,7 +1424,7 @@ rc_wakeup(chan)
 		int	s;
 
 		s = splsofttty();
-		rcpoll();
+		rcpoll(NULL);
 		splx(s);
 	}
 }