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, 11 insertions, 10 deletions

diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index b6ff7ea..c5c2392 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -714,7 +714,7 @@ mlx_submit_buf(struct mlx_softc *sc, mlx_bio *bp)
  * Accept an open operation on the control device.
  */
 int
-mlx_open(dev_t dev, int flags, int fmt, struct proc *p)
+mlx_open(dev_t dev, int flags, int fmt, struct thread *td)
 {
     int			unit = minor(dev);
     struct mlx_softc	*sc = devclass_get_softc(mlx_devclass, unit);
@@ -727,7 +727,7 @@ mlx_open(dev_t dev, int flags, int fmt, struct proc *p)
  * Accept the last close on the control device.
  */
 int
-mlx_close(dev_t dev, int flags, int fmt, struct proc *p)
+mlx_close(dev_t dev, int flags, int fmt, struct thread *td)
 {
     int			unit = minor(dev);
     struct mlx_softc	*sc = devclass_get_softc(mlx_devclass, unit);
@@ -740,7 +740,7 @@ mlx_close(dev_t dev, int flags, int fmt, struct proc *p)
  * Handle controller-specific control operations.
  */
 int
-mlx_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
+mlx_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct thread *td)
 {
     int				unit = minor(dev);
     struct mlx_softc		*sc = devclass_get_softc(mlx_devclass, unit);
@@ -927,7 +927,7 @@ mlx_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
  */
 int
 mlx_submit_ioctl(struct mlx_softc *sc, struct mlx_sysdrive *drive, u_long cmd, 
-		caddr_t addr, int32_t flag, struct proc *p)
+		caddr_t addr, int32_t flag, struct thread *td)
 {
     int				*arg = (int *)addr;
     int				error, result;
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 40c7263..49005b1 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -95,7 +95,7 @@ static driver_t mlxd_driver = {
 DRIVER_MODULE(mlxd, mlx, mlxd_driver, mlxd_devclass, 0, 0);
 
 static int
-mlxd_open(dev_t dev, int flags, int fmt, struct proc *p)
+mlxd_open(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct mlxd_softc	*sc = (struct mlxd_softc *)dev->si_drv1;
     struct disklabel	*label;
@@ -124,7 +124,7 @@ mlxd_open(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int
-mlxd_close(dev_t dev, int flags, int fmt, struct proc *p)
+mlxd_close(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct mlxd_softc	*sc = (struct mlxd_softc *)dev->si_drv1;
 
@@ -137,7 +137,7 @@ mlxd_close(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int
-mlxd_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
+mlxd_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct thread *td)
 {
     struct mlxd_softc	*sc = (struct mlxd_softc *)dev->si_drv1;
     int error;
@@ -147,7 +147,7 @@ mlxd_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
     if (sc == NULL)
 	return (ENXIO);
 
-    if ((error = mlx_submit_ioctl(sc->mlxd_controller, sc->mlxd_drive, cmd, addr, flag, p)) != ENOIOCTL) {
+    if ((error = mlx_submit_ioctl(sc->mlxd_controller, sc->mlxd_drive, cmd, addr, flag, td)) != ENOIOCTL) {
 	debug(0, "mlx_submit_ioctl returned %d\n", error);
 	return(error);
     }
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index a4de085..58c7a4b 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.h
@@ -240,8 +240,9 @@ struct mlxd_softc
  * Interface between driver core and disk driver (should be using a bus?)
  */
 extern int	mlx_submit_buf(struct mlx_softc *sc, mlx_bio *bp);
-extern int	mlx_submit_ioctl(struct mlx_softc *sc, struct mlx_sysdrive *drive, u_long cmd, 
-				 caddr_t addr, int32_t flag, struct proc *p);
+extern int	mlx_submit_ioctl(struct mlx_softc *sc,
+			struct mlx_sysdrive *drive, u_long cmd, 
+			caddr_t addr, int32_t flag, struct thread *td);
 extern void	mlxd_intr(void *data);