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/pci/agp.c b/sys/pci/agp.c
index 333c4c8..138fe45 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -270,7 +270,7 @@ agp_generic_detach(device_t dev)
 {
 	struct agp_softc *sc = device_get_softc(dev);
 	bus_release_resource(dev, SYS_RES_MEMORY, AGP_APBASE, sc->as_aperture);
-	lockmgr(&sc->as_lock, LK_DRAIN, 0, curproc);
+	lockmgr(&sc->as_lock, LK_DRAIN, 0, curthread);
 	lockdestroy(&sc->as_lock);
 	destroy_dev(sc->as_devnode);
 	agp_flush_cache();
@@ -389,7 +389,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
 	vm_page_t m;
 	int error;
 
-	lockmgr(&sc->as_lock, LK_EXCLUSIVE, 0, curproc);
+	lockmgr(&sc->as_lock, LK_EXCLUSIVE, 0, curthread);
 
 	if (mem->am_is_bound) {
 		device_printf(dev, "memory already bound\n");
@@ -450,7 +450,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
 							   OFF_TO_IDX(k));
 					vm_page_unwire(m, 0);
 				}
-				lockmgr(&sc->as_lock, LK_RELEASE, 0, curproc);
+				lockmgr(&sc->as_lock, LK_RELEASE, 0, curthread);
 				return error;
 			}
 		}
@@ -471,7 +471,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
 	mem->am_offset = offset;
 	mem->am_is_bound = 1;
 
-	lockmgr(&sc->as_lock, LK_RELEASE, 0, curproc);
+	lockmgr(&sc->as_lock, LK_RELEASE, 0, curthread);
 
 	return 0;
 }
@@ -483,7 +483,7 @@ agp_generic_unbind_memory(device_t dev, struct agp_memory *mem)
 	vm_page_t m;
 	int i;
 
-	lockmgr(&sc->as_lock, LK_EXCLUSIVE, 0, curproc);
+	lockmgr(&sc->as_lock, LK_EXCLUSIVE, 0, curthread);
 
 	if (!mem->am_is_bound) {
 		device_printf(dev, "memory is not bound\n");
@@ -508,7 +508,7 @@ agp_generic_unbind_memory(device_t dev, struct agp_memory *mem)
 	mem->am_offset = 0;
 	mem->am_is_bound = 0;
 
-	lockmgr(&sc->as_lock, LK_RELEASE, 0, curproc);
+	lockmgr(&sc->as_lock, LK_RELEASE, 0, curthread);
 
 	return 0;
 }
@@ -645,7 +645,7 @@ agp_unbind_user(device_t dev, agp_unbind *unbind)
 }
 
 static int
-agp_open(dev_t kdev, int oflags, int devtype, struct proc *p)
+agp_open(dev_t kdev, int oflags, int devtype, struct thread *td)
 {
 	device_t dev = KDEV2DEV(kdev);
 	struct agp_softc *sc = device_get_softc(dev);
@@ -659,7 +659,7 @@ agp_open(dev_t kdev, int oflags, int devtype, struct proc *p)
 }
 
 static int
-agp_close(dev_t kdev, int fflag, int devtype, struct proc *p)
+agp_close(dev_t kdev, int fflag, int devtype, struct thread *td)
 {
 	device_t dev = KDEV2DEV(kdev);
 	struct agp_softc *sc = device_get_softc(dev);
@@ -676,7 +676,7 @@ agp_close(dev_t kdev, int fflag, int devtype, struct proc *p)
 }
 
 static int
-agp_ioctl(dev_t kdev, u_long cmd, caddr_t data, int fflag, struct proc *p)
+agp_ioctl(dev_t kdev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	device_t dev = KDEV2DEV(kdev);
 
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 72c6988..4c701c4 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -1171,7 +1171,7 @@ struct	saa7116_regs	*m;
 
 
 int
-meteor_open(dev_t dev, int flags, int fmt, struct proc *p)
+meteor_open(dev_t dev, int flags, int fmt, struct thread *td)
 {
 	meteor_reg_t *mtr;
 	int	unit; 
@@ -1215,7 +1215,7 @@ meteor_open(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 int
-meteor_close(dev_t dev, int flags, int fmt, struct proc *p)
+meteor_close(dev_t dev, int flags, int fmt, struct thread *td)
 {
 	meteor_reg_t *mtr;
 	int	unit; 
@@ -1338,7 +1338,7 @@ meteor_write(dev_t dev, struct uio *uio, int ioflag)
 }
 
 int
-meteor_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *pr)
+meteor_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 {
 	int	error;  
 	int	unit;   
@@ -1402,7 +1402,7 @@ meteor_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *pr)
 	case METEORSSIGNAL:
 		mtr->signal = *(int *) arg;
 		if (mtr->signal) {
-		  mtr->proc = pr;
+		  mtr->proc = td->td_proc;
 		} else {
 		  mtr->proc = (struct proc *)0;
 		}
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index a1a8d6c..1cae322 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -115,7 +115,7 @@ xrpu_poll_pps(struct timecounter *tc)
 }
 
 static int
-xrpu_open(dev_t dev, int flag, int mode, struct proc *p)
+xrpu_open(dev_t dev, int flag, int mode, struct  thread *td)
 {
 	struct softc *sc = devclass_get_softc(xrpu_devclass, dev2unit(dev));
 
@@ -126,7 +126,7 @@ xrpu_open(dev_t dev, int flag, int mode, struct proc *p)
 }
 
 static int
-xrpu_close(dev_t dev, int flag, int mode, struct proc *p)
+xrpu_close(dev_t dev, int flag, int mode, struct  thread *td)
 { 
 	return (0);
 }
@@ -141,7 +141,7 @@ xrpu_mmap(dev_t dev, vm_offset_t offset, int nprot)
 }
 
 static int
-xrpu_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *pr)
+xrpu_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct  thread *tdr)
 {
 	struct softc *sc = dev->si_drv1;
 	int i, error;