KSE Milestone 2

Note ALL MODULES MUST BE RECOMPILED
make the kernel aware that there are smaller units of scheduling than the
process. (but only allow one thread per process at this time).
This is functionally equivalent to teh previousl -current except
that there is a thread associated with each process.

Sorry john! (your next MFC will be a doosie!)

Reviewed by: peter@freebsd.org, dillon@freebsd.org

X-MFC after:    ha ha ha ha

3 files changed, 16 insertions, 16 deletions

diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index 6f758de..7298244 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -112,7 +112,7 @@ static struct fla_s {
 } softc[8];
 
 static int
-flaopen(dev_t dev, int flag, int fmt, struct proc *p)
+flaopen(dev_t dev, int flag, int fmt, struct thread *td)
 {
 	struct fla_s *sc;
 	int error;
@@ -120,7 +120,7 @@ flaopen(dev_t dev, int flag, int fmt, struct proc *p)
 
 	if (fla_debug)
 		printf("flaopen(%s %x %x %p)\n",
-			devtoname(dev), flag, fmt, p);
+			devtoname(dev), flag, fmt, td);
 
 	sc = dev->si_drv1;
 
@@ -142,14 +142,14 @@ flaopen(dev_t dev, int flag, int fmt, struct proc *p)
 }
 
 static int
-flaclose(dev_t dev, int flags, int fmt, struct proc *p)
+flaclose(dev_t dev, int flags, int fmt, struct thread *td)
 {
 	int error;
 	struct fla_s *sc;
 
 	if (fla_debug)
 		printf("flaclose(%s %x %x %p)\n",
-			devtoname(dev), flags, fmt, p);
+			devtoname(dev), flags, fmt, td);
 
 	sc = dev->si_drv1;
 
@@ -162,12 +162,12 @@ flaclose(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int
-flaioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
+flaioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
 {
 
 	if (fla_debug)
 		printf("flaioctl(%s %lx %p %x %p)\n",
-			devtoname(dev), cmd, addr, flags, p);
+			devtoname(dev), cmd, addr, flags, td);
 
 	return (ENOIOCTL);
 }
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c
index 82778db..149d0c7 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil.c
@@ -469,8 +469,8 @@ int IPL_EXTERN(ioctl)(dev, cmd, data, mode
 # if (defined(_KERNEL) && ((_BSDI_VERSION >= 199510) || (BSD >= 199506) || \
        (NetBSD >= 199511) || (__FreeBSD_version >= 220000) || \
        defined(__OpenBSD__)))
-, p)
-struct proc *p;
+, td)
+struct thread *td;
 # else
 )
 # endif
@@ -903,9 +903,9 @@ int IPL_EXTERN(open)(dev_t dev, int flags)
 int IPL_EXTERN(open)(dev, flags
 #  if ((_BSDI_VERSION >= 199510) || (BSD >= 199506) || (NetBSD >= 199511) || \
      (__FreeBSD_version >= 220000) || defined(__OpenBSD__)) && defined(_KERNEL)
-, devtype, p)
+, devtype, td)
 int devtype;
-struct proc *p;
+struct thread *td;
 #  else
 )
 #  endif
@@ -933,9 +933,9 @@ int IPL_EXTERN(close)(dev_t dev, int flags, int devtype, cred_t *cp)
 int IPL_EXTERN(close)(dev, flags
 #  if ((_BSDI_VERSION >= 199510) || (BSD >= 199506) || (NetBSD >= 199511) || \
      (__FreeBSD_version >= 220000) || defined(__OpenBSD__)) && defined(_KERNEL)
-, devtype, p)
+, devtype, td)
 int devtype;
-struct proc *p;
+struct thread *td;
 #  else
 )
 #  endif
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h
index e53c65e..2934f7d 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/sys/contrib/ipfilter/netinet/ip_fil.h
@@ -558,12 +558,12 @@ extern	int	iplidentify __P((char *));
       (NetBSD >= 199511) || defined(__OpenBSD__)
 #    if defined(__NetBSD__) || (_BSDI_VERSION >= 199701) || \
        defined(__OpenBSD__) || (__FreeBSD_version >= 300000)
-extern	int	iplioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
+extern	int	iplioctl __P((dev_t, u_long, caddr_t, int, struct thread *));
 #    else
-extern	int	iplioctl __P((dev_t, int, caddr_t, int, struct proc *));
+extern	int	iplioctl __P((dev_t, int, caddr_t, int, struct thread *));
 #    endif
-extern	int	iplopen __P((dev_t, int, int, struct proc *));
-extern	int	iplclose __P((dev_t, int, int, struct proc *));
+extern	int	iplopen __P((dev_t, int, int, struct thread *));
+extern	int	iplclose __P((dev_t, int, int, struct thread *));
 #   else
 #    ifndef	linux
 extern	int	iplopen __P((dev_t, int));