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, 21 insertions, 21 deletions

diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 50e8511..528f09a 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1277,7 +1277,7 @@ vbi_read(bktr_ptr_t bktr, struct uio *uio, int ioflag)
  * video ioctls
  */
 int
-video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc* pr )
+video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td )
 {
 	volatile u_char		c_temp;
 	unsigned int		temp;
@@ -1565,7 +1565,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 			break;
 		}
 		bktr->signal = *(int *) arg;
-		bktr->proc = pr;
+		bktr->proc = td->td_proc;
 		break;
 
 	case METEORGSIGNAL:
@@ -1886,7 +1886,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
  * tuner ioctls
  */
 int
-tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc* pr )
+tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td )
 {
 	int		tmp_int;
 	unsigned int	temp, temp1;
diff --git a/sys/dev/bktr/bktr_core.h b/sys/dev/bktr/bktr_core.h
index bf41a99..5948ab6 100644
--- a/sys/dev/bktr/bktr_core.h
+++ b/sys/dev/bktr/bktr_core.h
@@ -82,13 +82,13 @@ int	video_open( bktr_ptr_t bktr );
 int	video_close( bktr_ptr_t bktr );
 int	video_read( bktr_ptr_t bktr, int unit, dev_t dev, struct uio *uio );
 int	video_ioctl( bktr_ptr_t bktr, int unit,
-			ioctl_cmd_t cmd, caddr_t arg, struct proc* pr );
+			ioctl_cmd_t cmd, caddr_t arg, struct thread* pr );
 
 
 int	tuner_open( bktr_ptr_t bktr );
 int	tuner_close( bktr_ptr_t bktr );
 int	tuner_ioctl( bktr_ptr_t bktr, int unit,
-			ioctl_cmd_t cmd, caddr_t arg, struct proc* pr );
+			ioctl_cmd_t cmd, caddr_t arg, struct thread* pr );
 
 int	vbi_open( bktr_ptr_t bktr );
 int	vbi_close( bktr_ptr_t bktr );
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index f916864..cc79745 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -559,7 +559,7 @@ get_bktr_mem( int unit, unsigned size )
  * 
  */
 int
-bktr_open( dev_t dev, int flags, int fmt, struct proc *p )
+bktr_open( dev_t dev, int flags, int fmt, struct thread *td )
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -639,7 +639,7 @@ bktr_open( dev_t dev, int flags, int fmt, struct proc *p )
  * 
  */
 int
-bktr_close( dev_t dev, int flags, int fmt, struct proc *p )
+bktr_close( dev_t dev, int flags, int fmt, struct thread *td )
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -716,7 +716,7 @@ bktr_write( dev_t dev, struct uio *uio, int ioflag )
  * 
  */
 int
-bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
+bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct thread *td )
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -735,9 +735,9 @@ bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
 
 	switch ( FUNCTION( minor(dev) ) ) {
 	case VIDEO_DEV:
-		return( video_ioctl( bktr, unit, cmd, arg, pr ) );
+		return( video_ioctl( bktr, unit, cmd, arg, td ) );
 	case TUNER_DEV:
-		return( tuner_ioctl( bktr, unit, cmd, arg, pr ) );
+		return( tuner_ioctl( bktr, unit, cmd, arg, td ) );
 	}
 
 	return( ENXIO );
@@ -777,7 +777,7 @@ bktr_mmap( dev_t dev, vm_offset_t offset, int nprot )
 	return( atop(vtophys(bktr->bigbuf) + offset) );
 }
 
-int bktr_poll( dev_t dev, int events, struct proc *p)
+int bktr_poll( dev_t dev, int events, struct thread *td)
 {
 	int		unit;
 	bktr_ptr_t	bktr;
@@ -800,7 +800,7 @@ int bktr_poll( dev_t dev, int events, struct proc *p)
 		switch ( FUNCTION( minor(dev) ) ) {
 		case VBI_DEV:
 			if(bktr->vbisize == 0)
-				selrecord(p, &bktr->vbi_select);
+				selrecord(td, &bktr->vbi_select);
 			else
 				revents |= events & (POLLIN | POLLRDNORM);
 			break;
@@ -1064,7 +1064,7 @@ get_bktr_mem( int unit, unsigned size )
  * 
  */
 int
-bktr_open( dev_t dev, int flags, int fmt, struct proc *p )
+bktr_open( dev_t dev, int flags, int fmt, struct thread *td )
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -1127,7 +1127,7 @@ bktr_open( dev_t dev, int flags, int fmt, struct proc *p )
  * 
  */
 int
-bktr_close( dev_t dev, int flags, int fmt, struct proc *p )
+bktr_close( dev_t dev, int flags, int fmt, struct thread *td )
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -1188,7 +1188,7 @@ bktr_write( dev_t dev, struct uio *uio, int ioflag )
  * 
  */
 int
-bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
+bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct thread *td )
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -1204,9 +1204,9 @@ bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
 
 	switch ( FUNCTION( minor(dev) ) ) {
 	case VIDEO_DEV:
-		return( video_ioctl( bktr, unit, cmd, arg, pr ) );
+		return( video_ioctl( bktr, unit, cmd, arg, td ) );
 	case TUNER_DEV:
-		return( tuner_ioctl( bktr, unit, cmd, arg, pr ) );
+		return( tuner_ioctl( bktr, unit, cmd, arg, td ) );
 	}
 
 	return( ENXIO );
@@ -1242,7 +1242,7 @@ int bktr_mmap( dev_t dev, vm_offset_t offset, int nprot )
 	return( i386_btop(vtophys(bktr->bigbuf) + offset) );
 }
 
-int bktr_poll( dev_t dev, int events, struct proc *p)
+int bktr_poll( dev_t dev, int events, struct thread *td)
 {
 	int		unit;
 	bktr_ptr_t	bktr;
@@ -1605,7 +1605,7 @@ free_bktr_mem(bktr, dmap, kva)
  * 
  */
 int
-bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_open(dev_t dev, int flags, int fmt, struct thread *td)
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -1638,7 +1638,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
  * 
  */
 int
-bktr_close(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_close(dev_t dev, int flags, int fmt, struct thread *td)
 {
 	bktr_ptr_t	bktr;
 	int		unit;
@@ -1697,7 +1697,7 @@ bktr_write(dev_t dev, struct uio *uio, int ioflag)
  * 
  */
 int
-bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr)
+bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct thread *td)
 {
 	bktr_ptr_t	bktr;
 	int		unit;