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

4 files changed, 21 insertions, 21 deletions

diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 75d9b44..5bfd303 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -439,7 +439,7 @@ fb_detach(dev_t dev, video_adapter_t *adp, struct cdevsw *cdevsw)
 }
 
 static int
-fbopen(dev_t dev, int flag, int mode, struct proc *p)
+fbopen(dev_t dev, int flag, int mode, struct thread *td)
 {
 	int unit;
 
@@ -449,11 +449,11 @@ fbopen(dev_t dev, int flag, int mode, struct proc *p)
 	if (vidcdevsw[unit] == NULL)
 		return ENXIO;
 	return (*vidcdevsw[unit]->d_open)(makedev(0, adapter[unit]->va_minor),
-					  flag, mode, p);
+					  flag, mode, td);
 }
 
 static int
-fbclose(dev_t dev, int flag, int mode, struct proc *p)
+fbclose(dev_t dev, int flag, int mode, struct thread *td)
 {
 	int unit;
 
@@ -461,7 +461,7 @@ fbclose(dev_t dev, int flag, int mode, struct proc *p)
 	if (vidcdevsw[unit] == NULL)
 		return ENXIO;
 	return (*vidcdevsw[unit]->d_close)(makedev(0, adapter[unit]->va_minor),
-					   flag, mode, p);
+					   flag, mode, td);
 }
 
 static int
@@ -489,7 +489,7 @@ fbwrite(dev_t dev, struct uio *uio, int flag)
 }
 
 static int
-fbioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
+fbioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 {
 	int unit;
 
@@ -497,7 +497,7 @@ fbioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
 	if (vidcdevsw[unit] == NULL)
 		return ENXIO;
 	return (*vidcdevsw[unit]->d_ioctl)(makedev(0, adapter[unit]->va_minor),
-					   cmd, arg, flag, p);
+					   cmd, arg, flag, td);
 }
 
 static int
@@ -523,7 +523,7 @@ DEV_DRIVER_MODULE(fb, ???, fb_driver, fb_devclass, fb_cdevsw, 0, 0);
  */
 
 int genfbopen(genfb_softc_t *sc, video_adapter_t *adp, int flag, int mode,
-	      struct proc *p)
+	      struct thread *td)
 {
 	int s;
 
@@ -535,7 +535,7 @@ int genfbopen(genfb_softc_t *sc, video_adapter_t *adp, int flag, int mode,
 }
 
 int genfbclose(genfb_softc_t *sc, video_adapter_t *adp, int flag, int mode,
-	       struct proc *p)
+	       struct thread *td)
 {
 	int s;
 
@@ -578,7 +578,7 @@ int genfbwrite(genfb_softc_t *sc, video_adapter_t *adp, struct uio *uio,
 }
 
 int genfbioctl(genfb_softc_t *sc, video_adapter_t *adp, u_long cmd,
-	       caddr_t arg, int flag, struct proc *p)
+	       caddr_t arg, int flag, struct thread *td)
 {
 	int error;
 
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index e8a8513..1fcaf13 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -184,15 +184,15 @@ typedef struct genfb_softc {
 } genfb_softc_t;
 
 int		genfbopen(genfb_softc_t *sc, video_adapter_t *adp,
-			  int flag, int mode, struct proc *p);
+			  int flag, int mode, struct thread *td);
 int		genfbclose(genfb_softc_t *sc, video_adapter_t *adp,
-			   int flag, int mode, struct proc *p);
+			   int flag, int mode, struct thread *td);
 int		genfbread(genfb_softc_t *sc, video_adapter_t *adp,
 			  struct uio *uio, int flag);
 int		genfbwrite(genfb_softc_t *sc, video_adapter_t *adp,
 			   struct uio *uio, int flag);
 int		genfbioctl(genfb_softc_t *sc, video_adapter_t *adp,
-			   u_long cmd, caddr_t arg, int flag, struct proc *p);
+			   u_long cmd, caddr_t arg, int flag, struct thread *td);
 int		genfbmmap(genfb_softc_t *sc, video_adapter_t *adp,
 			  vm_offset_t offset, int prot);
 
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 838228b..19d6f1f 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -96,20 +96,20 @@ vga_attach_unit(int unit, vga_softc_t *sc, int flags)
 #ifdef FB_INSTALL_CDEV
 
 int
-vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode, struct proc *p)
+vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode, struct thread *td)
 {
 	if (sc == NULL)
 		return ENXIO;
 	if (mode & (O_CREAT | O_APPEND | O_TRUNC))
 		return ENODEV;
 
-	return genfbopen(&sc->gensc, sc->adp, flag, mode, p);
+	return genfbopen(&sc->gensc, sc->adp, flag, mode, td);
 }
 
 int
-vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode, struct proc *p)
+vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode, struct thread *td)
 {
-	return genfbclose(&sc->gensc, sc->adp, flag, mode, p);
+	return genfbclose(&sc->gensc, sc->adp, flag, mode, td);
 }
 
 int
@@ -126,9 +126,9 @@ vga_write(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag)
 
 int
 vga_ioctl(dev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag,
-	  struct proc *p)
+	  struct thread *td)
 {
-	return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, p);
+	return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, td);
 }
 
 int
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index d50e5f2..f59c7ee 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -79,13 +79,13 @@ int		vga_attach_unit(int unit, vga_softc_t *sc, int flags);
 
 #ifdef FB_INSTALL_CDEV
 int		vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode,
-			 struct proc *p);
+			 struct thread *td);
 int		vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode,
-			  struct proc *p);
+			  struct thread *td);
 int		vga_read(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag);
 int		vga_write(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag);
 int		vga_ioctl(dev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg,
-			  int flag, struct proc *p);
+			  int flag, struct thread *td);
 int		vga_mmap(dev_t dev, vga_softc_t *sc, vm_offset_t offset,
 			 int prot);
 #endif