*BSD News Article 58336


Return to BSD News archive

Newsgroups: comp.bugs.2bsd
Path: euryale.cc.adfa.oz.au!newshost.anu.edu.au!harbinger.cc.monash.edu.au!nntp.coast.net!news.kei.com!newsfeed.internetmci.com!in1.uu.net!news.new-york.net!wlbr!sms
From: sms@wlv.iipo.gtegsc.com (Steven M. Schultz)
Subject: TU81 bug,statfs(2)+fstatfs(2)+getfsstat(2) missing, More (#284 2 of 4)
Sender: news@wlbr.iipo.gtegsc.com (Steven M. Schultz)
Organization: GTE Government Systems, Thousand Oaks CA USA
Message-ID: <DKAHCz.9JC@wlbr.iipo.gtegsc.com>
X-Nntp-Posting-Host: wlv.iipo.gtegsc.com
Date: Thu, 28 Dec 1995 09:07:47 GMT
Lines: 1072

Subject: TU81 bug,statfs(2)+fstatfs(2)+getfsstat(2) missing, More (#284 2 of 4)
Index:	sys/pdpuba,pdp,sys 2.11BSD

Description:
	See #283.

Repeat-By:
	See #283.

Fix:
	This is #284, part 2 of 4.  Refer to #283 for installation instructions.

	The following files are updated by this part of the update kit:

/usr/include/syscall.h
/usr/lib/tmac/tmac.an.new
/usr/src/bin/mt.c
/usr/src/etc/Makefile
/usr/src/etc/mount.c
/usr/src/lib/libc/gen/Makefile
/usr/src/lib/libc/pdp/sys/Makefile
/usr/src/man/man1/mt.1
/usr/src/man/man2/Makefile
/usr/src/man/man3/Makefile
/usr/src/man/man4/mtio.4
/usr/src/man/man4/tmscp.4
/usr/src/man/man8/Makefile
/usr/src/sys/conf/GENERIC
/usr/src/sys/conf/Make.nsunix
/usr/src/sys/conf/Make.pdpuba
/usr/src/sys/conf/Make.sunix
/usr/src/sys/conf/Make.sys
/usr/src/sys/conf/Make.unix

--------------------------cut here---------------------------
*** /usr/include/syscall.h.old	Mon May  8 22:32:57 1995
--- /usr/include/syscall.h	Sun Dec 24 14:37:19 1995
***************
*** 3,9 ****
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)syscall.h	5.4.4 (2.11BSD GTE) 1995/05/08
   */
  
  #define	SYS_exit	1
--- 3,9 ----
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)syscall.h	5.4.5 (2.11BSD GTE) 1995/12/24
   */
  
  #define	SYS_exit	1
***************
*** 33,41 ****
  #define	SYS_geteuid	25
  #define	SYS_ptrace	26
  #define	SYS_getppid	27
! 				/* 28 is old: fstat */
! 				/* 29 is old: pause */
! 				/* 30 is old: utime */
  				/* 31 is old: stty */
  				/* 32 is old: gtty */
  #define	SYS_access	33
--- 33,41 ----
  #define	SYS_geteuid	25
  #define	SYS_ptrace	26
  #define	SYS_getppid	27
! #define	SYS_statfs	28
! #define	SYS_fstatfs	29
! #define	SYS_getfsstat	30
  				/* 31 is old: stty */
  				/* 32 is old: gtty */
  #define	SYS_access	33
*** /usr/lib/tmac/tmac.an.new.old	Thu Feb 19 23:41:59 1987
--- /usr/lib/tmac/tmac.an.new	Tue Dec 26 15:18:25 1995
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmac.an.new	6.3 (Berkeley) 2/2/86
  .\"
  '	DT, PD, SM, and B macros invoked internally.
  '	# month name
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmac.an.new	6.3.1 (2.11BSD) 1995/12/26
  .\"
  '	DT, PD, SM, and B macros invoked internally.
  '	# month name
***************
*** 53,58 ****
--- 53,59 ----
  .	if "\\$1"4" .ds ]W 4th Berkeley Distribution
  .	if "\\$1"5" .ds ]W 4.2 Berkeley Distribution
  .	if "\\$1"6" .ds ]W 4.3 Berkeley Distribution
+ .	if "\\$1"7" .ds ]W 4.4 Berkeley Distribution
  .\}
  ..
  '	# reset the basic page layout
*** /usr/src/bin/mt.c.old	Tue Jul  6 19:55:36 1993
--- /usr/src/bin/mt.c	Fri Dec 22 20:26:27 1995
***************
*** 11,17 ****
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)mt.c	2.0 (2.11BSD) 7/6/93";
  #endif not lint
  
  /*
--- 11,17 ----
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)mt.c	2.1 (2.11BSD) 1995/12/22";
  #endif not lint
  
  /*
***************
*** 41,46 ****
--- 41,48 ----
  	{ "offline",	MTOFFL,	1 },
  	{ "rewoffl",	MTOFFL,	1 },
  	{ "status",	MTNOP,	1 },
+ 	{ "cacheon",	MTCACHE, 1 },
+ 	{ "cacheoff",	MTNOCACHE, 1 },
  	{ 0 }
  };
  
***************
*** 121,128 ****
  #include <pdpuba/tmreg.h>
  #undef b_repcnt		/* argh */
  #include <pdpuba/tsreg.h>
- #define NRSP 0
- #define NCMD 0
  #include <pdpuba/tmscpreg.h>
  #endif
  
--- 123,128 ----
*** /usr/src/etc/Makefile.old	Fri Apr  7 20:51:32 1995
--- /usr/src/etc/Makefile	Tue Dec 26 21:15:50 1995
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.14.3 (2.11BSD GTE) 4/7/95
  #
  DESTDIR=
  CFLAGS=	-O
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.14.4 (2.11BSD GTE) 1995/12/26
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 13,19 ****
  #
  SUBDIR=	chroot config dev_mkdb dump fingerd fsck ftpd getty htable implog \
  	named restor routed talkd termcap tftpd timed tzone XNSrouted \
! 	mkpasswd vipw rlogind rshd tcpd
  
  # Shell scripts that need only be installed and are never removed.
  #
--- 13,19 ----
  #
  SUBDIR=	chroot config dev_mkdb dump fingerd fsck ftpd getty htable implog \
  	named restor routed talkd termcap tftpd timed tzone XNSrouted \
! 	mkpasswd ping vipw rlogind rshd tcpd
  
  # Shell scripts that need only be installed and are never removed.
  #
***************
*** 35,41 ****
  
  # Programs that must run setuid to root
  #
! SETUID=	ping
  
  # C programs that must run set-group-id kmem.
  #
--- 35,41 ----
  
  # Programs that must run setuid to root
  #
! SETUID=
  
  # C programs that must run set-group-id kmem.
  #
*** /usr/src/etc/mount.c.old	Sun Feb 15 20:51:18 1987
--- /usr/src/etc/mount.c	Tue Dec 26 19:52:10 1995
***************
*** 4,18 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
! #ifndef lint
! static char sccsid[] = "@(#)mount.c	5.2 (Berkeley) 11/21/85";
! #endif not lint
  
  /*
   * mount
--- 4,16 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)mount.c	5.2.1 (2.11BSD) 1995/12/26";
! #endif
  
  /*
   * mount
***************
*** 84,91 ****
  		if (setfsent() == 0)
  			perror(FSTAB), exit(1);
  		while ((fsp = getfsent()) != 0) {
- 			if (strcmp(fsp->fs_file, "/") == 0)
- 				continue;
  			if (strcmp(fsp->fs_type, FSTAB_RO) &&
  			    strcmp(fsp->fs_type, FSTAB_RW) &&
  			    strcmp(fsp->fs_type, FSTAB_RQ))
--- 82,87 ----
*** /usr/src/lib/libc/gen/Makefile.old	Thu Apr 13 22:08:34 1995
--- /usr/src/lib/libc/gen/Makefile	Tue Dec 26 17:22:42 1995
***************
*** 17,23 ****
  	ctime.c ctype_.c daemon.c devname.c disklabel.c err.c errlst.c \
  	execvp.c fakcu.c \
  	fstab.c gcvt.c getenv.c getgrent.c getgrgid.c getgrnam.c getlogin.c \
! 	getpass.c getpwent.c getloadavg.c \
  	getttyent.c getttynam.c getusershell.c getwd.c \
  	initgroups.c isatty.c malloc.c mktemp.c ndbm.c nlist.c \
  	opendir.c perror.c popen.c psignal.c qsort.c random.c readdir.c \
--- 17,23 ----
  	ctime.c ctype_.c daemon.c devname.c disklabel.c err.c errlst.c \
  	execvp.c fakcu.c \
  	fstab.c gcvt.c getenv.c getgrent.c getgrgid.c getgrnam.c getlogin.c \
! 	getpass.c getpwent.c getloadavg.c getmntinfo.c \
  	getttyent.c getttynam.c getusershell.c getwd.c \
  	initgroups.c isatty.c malloc.c mktemp.c ndbm.c nlist.c \
  	opendir.c perror.c popen.c psignal.c qsort.c random.c readdir.c \
***************
*** 30,36 ****
  	ctime.o ctype_.o daemon.o devname.o disklabel.o err.o errlst.o \
  	execvp.o fakcu.o \
  	fstab.o gcvt.o getenv.o getgrent.o getgrgid.o getgrnam.o getlogin.o \
! 	getpass.o getpwent.o getloadavg.o \
  	getttyent.o getttynam.o getusershell.o getwd.o \
  	initgroups.o isatty.o malloc.o mktemp.o ndbm.o nlist.o \
  	opendir.o perror.o popen.o psignal.o qsort.o random.o readdir.o \
--- 30,36 ----
  	ctime.o ctype_.o daemon.o devname.o disklabel.o err.o errlst.o \
  	execvp.o fakcu.o \
  	fstab.o gcvt.o getenv.o getgrent.o getgrgid.o getgrnam.o getlogin.o \
! 	getpass.o getpwent.o getloadavg.o getmntinfo.o \
  	getttyent.o getttynam.o getusershell.o getwd.o \
  	initgroups.o isatty.o malloc.o mktemp.o ndbm.o nlist.o \
  	opendir.o perror.o popen.o psignal.o qsort.o random.o readdir.o \
*** /usr/src/lib/libc/pdp/sys/Makefile.old	Fri May 12 22:48:29 1995
--- /usr/src/lib/libc/pdp/sys/Makefile	Sun Dec 24 14:39:43 1995
***************
*** 1,6 ****
  # Placed in the public domain - 1995/05/06
  #
! #	@(#)Makefile	1.1 (2.11BSD) 1995/05/08
  
  CPP= /lib/cpp
  LD= /bin/ld
--- 1,6 ----
  # Placed in the public domain - 1995/05/06
  #
! #	@(#)Makefile	1.2 (2.11BSD) 1995/12/24
  
  CPP= /lib/cpp
  LD= /bin/ld
***************
*** 32,37 ****
--- 32,38 ----
  	sendto.o setgroups.o setitimer.o setpgrp.o setpriority.o setquota.o \
  	setregid.o setreuid.o setrlimit.o setsockopt.o settimeofday.o \
  	shutdown.o sigstack.o socket.o socketpair.o stat.o symlink.o \
+ 	statfs.o fstatfs.o getfsstat.o \
  	truncate.o umount.o unlink.o utimes.o wait4.o write.o writev.o
  
  # these are generated with a second argument to SYSCALL of 'long'
*** /usr/src/man/man1/mt.1.old	Sun Dec 14 15:06:12 1986
--- /usr/src/man/man1/mt.1	Fri Dec 22 21:39:25 1995
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mt.1	6.2 (Berkeley) 5/9/86
  .\"
! .TH MT 1 "May 9, 1986"
  .UC 4
  .SH NAME
  mt \- magnetic tape manipulating program
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mt.1	6.2.1 (2.11BSD) 1995/12/22
  .\"
! .TH MT 1 "December 22, 1995"
  .UC 4
  .SH NAME
  mt \- magnetic tape manipulating program
***************
*** 77,88 ****
  .TP
  .B status
  Print status information about the tape unit.
  .PP
  .I Mt
  returns a 0 exit status when the operation(s) were successful,
  1 if the command was unrecognized, and 2 if an operation failed.
  .SH FILES
  .DT
  /dev/rmt*	Raw magnetic tape interface
  .SH "SEE ALSO"
! mtio(4), dd(1), ioctl(2), environ(7)
--- 77,108 ----
  .TP
  .B status
  Print status information about the tape unit.
+ .TP
+ .B cacheon
+ Enable the readahead/writebehind cache on the tape unit.
+ .TP
+ .B cacheoff
+ Turn off the readahead/writebehind cache on the tape unit.
  .PP
  .I Mt
  returns a 0 exit status when the operation(s) were successful,
  1 if the command was unrecognized, and 2 if an operation failed.
+ .PP
+ The 
+ .B cacheon
+ and
+ .B cacheoff
+ commands currently only apply to the TMSCP driver and then only
+ for certain drives such as the TU81+.  No error is produced by the
+ TMSCP driver if the cache commands are used.  Other drivers will 
+ return an error code since they do not recognize the 
+ .B MTCACHE
+ and
+ .B MTNOCACHE
+ functions codes.  See
+ .BR mtio (4).
  .SH FILES
  .DT
  /dev/rmt*	Raw magnetic tape interface
  .SH "SEE ALSO"
! mtio(4), tmscp(4), dd(1), ioctl(2), environ(7)
*** /usr/src/man/man2/Makefile.old	Wed Jan 18 20:21:15 1995
--- /usr/src/man/man2/Makefile	Tue Dec 26 15:30:42 1995
***************
*** 14,20 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	2.4 (2.11BSD GTE) 1/18/95
  #
  MDIR=	/usr/man/cat2
  SRCS=	accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chmod.2 \
--- 14,20 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	2.5 (2.11BSD GTE) 1995/12/26
  #
  MDIR=	/usr/man/cat2
  SRCS=	accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chmod.2 \
***************
*** 24,29 ****
--- 24,30 ----
  	getgid.2 getgroups.2 gethostid.2 gethostname.2 getitimer.2 \
  	getpagesize.2 getpeername.2 getpgrp.2 getpid.2 getpriority.2 \
  	getrlimit.2 getrusage.2 getsockname.2 getsockopt.2 gettimeofday.2 \
+ 	getfsstat.2 \
  	getuid.2 intro.2 ioctl.2 kill.2 killpg.2 link.2 listen.2 \
  	lock.2 lseek.2 mkdir.2 mknod.2 mount.2 nostk.2 open.2 phys.2 \
  	pipe.2 profil.2 ptrace.2 quota.2 read.2 readlink.2 reboot.2 \
***************
*** 30,36 ****
  	recv.2 rename.2 rmdir.2 select.2 send.2 setgroups.2 setpgrp.2 \
  	setquota.2 setregid.2 setreuid.2 shutdown.2 sigblock.2 sigpause.2 \
  	sigreturn.2 sigsetmask.2 sigstack.2 sigvec.2 socket.2 socketpair.2 \
! 	stat.2 swapon.2 symlink.2 sync.2 syscall.2 truncate.2 ucall.2 \
  	umask.2 unlink.2 utimes.2 vfork.2 vhangup.2 wait.2 write.2
  OBJS=	accept.0 access.0 acct.0 adjtime.0 bind.0 brk.0 chdir.0 chmod.0 \
  	chown.0 chroot.0 close.0 connect.0 creat.0 dup.0 execve.0 exit.0 \
--- 31,37 ----
  	recv.2 rename.2 rmdir.2 select.2 send.2 setgroups.2 setpgrp.2 \
  	setquota.2 setregid.2 setreuid.2 shutdown.2 sigblock.2 sigpause.2 \
  	sigreturn.2 sigsetmask.2 sigstack.2 sigvec.2 socket.2 socketpair.2 \
! 	stat.2 statfs.2 swapon.2 symlink.2 sync.2 syscall.2 truncate.2 ucall.2 \
  	umask.2 unlink.2 utimes.2 vfork.2 vhangup.2 wait.2 write.2
  OBJS=	accept.0 access.0 acct.0 adjtime.0 bind.0 brk.0 chdir.0 chmod.0 \
  	chown.0 chroot.0 close.0 connect.0 creat.0 dup.0 execve.0 exit.0 \
***************
*** 39,44 ****
--- 40,46 ----
  	getgid.0 getgroups.0 gethostid.0 gethostname.0 getitimer.0 \
  	getpagesize.0 getpeername.0 getpgrp.0 getpid.0 getpriority.0 \
  	getrlimit.0 getrusage.0 getsockname.0 getsockopt.0 gettimeofday.0 \
+ 	getfsstat.0 \
  	getuid.0 intro.0 ioctl.0 kill.0 killpg.0 link.0 listen.0 \
  	lock.0 lseek.0 mkdir.0 mknod.0 mount.0 nostk.0 open.0 phys.0 \
  	pipe.0 profil.0 ptrace.0 quota.0 read.0 readlink.0 reboot.0 \
***************
*** 45,51 ****
  	recv.0 rename.0 rmdir.0 select.0 send.0 setgroups.0 setpgrp.0 \
  	setquota.0 setregid.0 setreuid.0 shutdown.0 sigblock.0 sigpause.0 \
  	sigreturn.0 sigsetmask.0 sigstack.0 sigvec.0 socket.0 socketpair.0 \
! 	stat.0 swapon.0 symlink.0 sync.0 syscall.0 truncate.0 ucall.0 \
  	umask.0 unlink.0 utimes.0 vfork.0 vhangup.0 wait.0 write.0
  
  .SUFFIXES: .2 .0
--- 47,53 ----
  	recv.0 rename.0 rmdir.0 select.0 send.0 setgroups.0 setpgrp.0 \
  	setquota.0 setregid.0 setreuid.0 shutdown.0 sigblock.0 sigpause.0 \
  	sigreturn.0 sigsetmask.0 sigstack.0 sigvec.0 socket.0 socketpair.0 \
! 	stat.0 statfs.0 swapon.0 symlink.0 sync.0 syscall.0 truncate.0 ucall.0 \
  	umask.0 unlink.0 utimes.0 vfork.0 vhangup.0 wait.0 write.0
  
  .SUFFIXES: .2 .0
***************
*** 80,85 ****
--- 82,89 ----
  	ln ${DESTDIR}${MDIR}/send.0 ${DESTDIR}${MDIR}/sendmsg.0
  	rm -f ${DESTDIR}${MDIR}/sendto.0
  	ln ${DESTDIR}${MDIR}/send.0 ${DESTDIR}${MDIR}/sendto.0
+ 	rm -f ${DESTDIR}${MDIR}/fstatfs.0
+ 	ln ${DESTDIR}${MDIR}/statfs.0 ${DESTDIR}${MDIR}/fstatfs.0
  	rm -f ${DESTDIR}${MDIR}/wait3.0
  	rm -f ${DESTDIR}${MDIR}/wait4.0
  	rm -f ${DESTDIR}${MDIR}/waitpid.0
*** /usr/src/man/man3/Makefile.old	Sun Sep 10 18:03:02 1995
--- /usr/src/man/man3/Makefile	Tue Dec 26 17:20:33 1995
***************
*** 14,20 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4.4 (2.11BSD) 1995/09/10
  #
  MDIR=	/usr/man/cat3
  SRCS1=	abort.3 abs.3 alarm.3 asinh.3 assert.3 atof.3 bstring.3 byteorder.3 \
--- 14,20 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4.5 (2.11BSD) 1995/12/26
  #
  MDIR=	/usr/man/cat3
  SRCS1=	abort.3 abs.3 alarm.3 asinh.3 assert.3 atof.3 bstring.3 byteorder.3 \
***************
*** 23,29 ****
  	exp.3 fclose.3 ferror.3 floor.3 \
  	fopen.3 fread.3 frexp.3 fseek.3 getc.3 getdisk.3 getenv.3 getfsent.3 \
  	getgrent.3 gethostbyname.3 getlogin.3 getnetent.3 getopt.3 getpass.3 \
! 	getloadavg.3 \
  	getprotoent.3 getpwent.3 gets.3 getservent.3 getttyent.3 \
  	getusershell.3 getwd.3 hypot.3 ieee.3 inet.3 infnan.3 initgroups.3 
  SRCS2=	insque.3 intro.3 j0.3 l3tol.3 ldfps.3 lgamma.3 lib2648.3 \
--- 23,29 ----
  	exp.3 fclose.3 ferror.3 floor.3 \
  	fopen.3 fread.3 frexp.3 fseek.3 getc.3 getdisk.3 getenv.3 getfsent.3 \
  	getgrent.3 gethostbyname.3 getlogin.3 getnetent.3 getopt.3 getpass.3 \
! 	getloadavg.3 getmntinfo.3 \
  	getprotoent.3 getpwent.3 gets.3 getservent.3 getttyent.3 \
  	getusershell.3 getwd.3 hypot.3 ieee.3 inet.3 infnan.3 initgroups.3 
  SRCS2=	insque.3 intro.3 j0.3 l3tol.3 ldfps.3 lgamma.3 lib2648.3 \
***************
*** 42,48 ****
  	fopen.0 fread.0 frexp.0 fseek.0 getc.0 getdisk.0 getenv.0 getfsent.0 \
  	getgrent.0 gethostbyname.0 getlogin.0 getnetent.0 getopt.0 getpass.0 \
  	getprotoent.0 getpwent.0 gets.0 getservent.0 getttyent.0 \
! 	getloadavg.0 \
  	getusershell.0 getwd.0 hypot.0 ieee.0 inet.0 infnan.0 initgroups.0 
  OBJS2=	insque.0 intro.0 j0.0 l3tol.0 ldfps.0 lgamma.0 lib2648.0 \
  	malloc.0 math.0 mktemp.0 monitor.0 mp.0 ndbm.0 nice.0 nlist.0 ns.0 \
--- 42,48 ----
  	fopen.0 fread.0 frexp.0 fseek.0 getc.0 getdisk.0 getenv.0 getfsent.0 \
  	getgrent.0 gethostbyname.0 getlogin.0 getnetent.0 getopt.0 getpass.0 \
  	getprotoent.0 getpwent.0 gets.0 getservent.0 getttyent.0 \
! 	getloadavg.0 getmntinfo.0 \
  	getusershell.0 getwd.0 hypot.0 ieee.0 inet.0 infnan.0 initgroups.0 
  OBJS2=	insque.0 intro.0 j0.0 l3tol.0 ldfps.0 lgamma.0 lib2648.0 \
  	malloc.0 math.0 mktemp.0 monitor.0 mp.0 ndbm.0 nice.0 nlist.0 ns.0 \
*** /usr/src/man/man4/mtio.4.old	Sun Jul 26 01:22:42 1987
--- /usr/src/man/man4/mtio.4	Fri Dec 22 21:35:11 1995
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mtio.4	6.2 (Berkeley) 7/25/87
  .\"
! .TH MTIO 4 "July 25, 1987"
  .UC 2
  .SH NAME
  mtio \- UNIX magtape interface
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mtio.4	6.3 (2.11BSD) 1995/12/22
  .\"
! .TH MTIO 4 "December 22, 1995"
  .UC 2
  .SH NAME
  mtio \- UNIX magtape interface
***************
*** 145,150 ****
--- 145,154 ----
  A zero byte count is returned when a tape mark is read,
  but another read will fetch the first record of the
  new tape file.
+ .PP
+ The MTCACHE and MTNOCACHE commands do not apply to all tape drivers.  At
+ present only the TMSCP driver supports those commands and then only for
+ drives such as the TU81+.
  .SH FILES
  /dev/mt?
  .br
*** /usr/src/man/man4/tmscp.4.old	Wed Jul 28 20:35:25 1993
--- /usr/src/man/man4/tmscp.4	Fri Dec 22 22:31:03 1995
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmscp.4	1.1 (2.11BSD) 7/28/93
  .\"
! .TH TMSCP 4 "July 28, 1993"
  .UC 2
  .SH NAME
  tmscp \- DEC TMSCP magtape interface
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmscp.4	1.2 (2.11BSD) 1995/12/22
  .\"
! .TH TMSCP 4 "December 22, 1995"
  .UC 2
  .SH NAME
  tmscp \- DEC TMSCP magtape interface
***************
*** 78,128 ****
  (because because TMSCP only defines values for three densities) and
  request the middle density (for tri-density tape drives).
  .SH DIAGNOSTICS
! .BR "tms controller failed to init" .
! The controller initialization procedure failed.
! This probably indicates a hardware problem.
  .PP
! .BR "tms%d: sa 0%o, state %d" .
! (Additional status information given after a hard I/O error.)
! The values of the controller status register and the internal
! driver state are printed.
  .PP
! .BR "tms%d: random interrupt ignored" .
! An unexpected interrupt was received (e.g. when no i/o was
! pending).  The interrupt is ignored.
  .PP
! .BR "tms%d:  interrupt in unknown state %d ignored" .
! An interrupt was received when the driver was in an unknown
! internal state.  Indicates a hardware problem or a driver bug.
  .PP
! .BR "tms%d:  fatal error (0%o)" .
  The controller detected a ``fatal error'' in the status returned
  to the host.  The contents of the status register are displayed.
  .PP
! .BR OFFLINE .
! (Additional status information given after a hard I/O error.)
! A hard I/O error occurred because the drive was not on-line.
  .PP
! The following errors are interpretations of TMSCP error messages
! returned by the controller to the host.
! Each is preceded by either
! .B "tms%d: hard error"
! or
! .BR "tms%d: soft error" .
  .PP
! .BR "controller error, event 0%o" .
  .PP
! .BR "host memory access error, event 0%o, addr 0%o" .
  .PP
! .BR "tape transfer error, unit %d, grp 0x%x, event 0%o" .
  .PP
! .BR "STI error, unit %d, event 0%o" .
  .PP
! .BR "STI Drive Error Log, unit %d, event 0%o" .
  .PP
! .BR "STI Formatter Error Log, unit %d, event 0%o" .
  .PP
! .BR "unknown error, unit %d, format 0%o, event 0%o" .
  .SH "SEE ALSO"
  mt(1), tar(1), tp(1), mtio(4), tm(4), ts(4), ut(4), dmesg(8), dtab(5),
  autoconfig(8)
--- 78,143 ----
  (because because TMSCP only defines values for three densities) and
  request the middle density (for tri-density tape drives).
  .SH DIAGNOSTICS
! .BR "tms: !drives" .
! Not enough drives were declared when the kernel was built.  The NTMS parameter
! in the kernel config file needs to be increased by at least one.
  .PP
! .BR "tms%d stepN init failed: sa %x" .
! Step N of the 4 step initialization sequence has failed.
  .PP
! .BR "tms%d: random intr" .
! An unexpected interrupt was received.  This is indicative of some other
! device using the same interrupt vector as the TMSCP controller.
! The interrupt is ignored.
  .PP
! .BR "tms%d Ver %d Mod %d" .
! The version and model number of the controller are displayed when the
! controller is initialized.  This is an information message and not an error.
  .PP
! .BR "tms%d: state %d" .
! The controller state is not one of the 4 initialization states or the RUN
! state.  This indicates a serious problem in the driver and possibly the
! hardware.
! .PP
! .BR "tms%d:  fatal error %x" .
  The controller detected a ``fatal error'' in the status returned
  to the host.  The contents of the status register are displayed.
  .PP
! .BR "tms%d init fail" .
! The controller failed to initialize.  Indicative of a hardware problem.
  .PP
! .BR "tms%d,%d flush fail" .
! The cache failed to flush during a close operation.  Data loss is possible
! in this case.
  .PP
! .BR "tms%d,%d: sa %x state %d" .
! A fatal error.  The controller will be reset in an attempt to resume
! operation.
  .PP
! .BR "tms ioctl" .
! An invalid internal ioctl function call has been made.  This is a driver
! bug.
  .PP
! .BR "tms%d,%d inv end" .
! An invalid end (completion) code has been detected.  A drive has returned
! 0 as the opcode originally issued.  This is a hardware problem.
  .PP
! .BR "tms%d,%d bad rsp: %x" .
! An unrecognized response has been received.  This is a driver bug.
  .PP
! .BR "tms%d,%d cache lost"
! The cache on the drive has been lost.  Data loss is likely.  Usually due to
! a hardware problem.
  .PP
! The following error is produced when a TMSCP error log datagram is received:
! .sp
! .BR "tms%d,%d dgram fmt=%x evt=%x grp=%x flg=%x pos=%D" .
  .PP
! Earlier versions of the driver consumed a noticeable amount of kernel D-space
! decoding and pretty printing more detailed information.  This has been 
! removed in favor of a shorter message.  In the future an error
! log daemon will be written and the datagrams from the MSCP and TMSCP
! drivers passed to it for analysis.
  .SH "SEE ALSO"
  mt(1), tar(1), tp(1), mtio(4), tm(4), ts(4), ut(4), dmesg(8), dtab(5),
  autoconfig(8)
*** /usr/src/man/man8/Makefile.old	Tue Jan 19 20:46:17 1993
--- /usr/src/man/man8/Makefile	Tue Dec 26 21:17:31 1995
***************
*** 14,20 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4 (Berkeley) 7/9/88
  #
  MDIR=	/usr/man/cat8
  SRCS=	XNSrouted.8 ac.8 adduser.8 arff.8 arp.8 autoconfig.8 bad144.8 \
--- 14,20 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4.1 (2.11BSD) 1995/12/26
  #
  MDIR=	/usr/man/cat8
  SRCS=	XNSrouted.8 ac.8 adduser.8 arff.8 arp.8 autoconfig.8 bad144.8 \
***************
*** 24,30 ****
  	gettable.8 getty.8 htable.8 icheck.8 ifconfig.8 implog.8 \
  	implogd.8 inetd.8 init.8 intro.8 kgmon.8 lpc.8 lpd.8 makedev.8 \
  	makekey.8 mkfs.8 mkhosts.8 mklost+found.8 mknod.8 mkproto.8 \
! 	mount.8 named.8 ncheck.8 newfs.8 pac.8 ping.8 pstat.8 quot.8 \
  	quotacheck.8 quotaon.8 rc.8 rdump.8 reboot.8 renice.8 repquota.8 \
  	restor.8 rexecd.8 rmt.8 route.8 routed.8 rrestore.8 \
  	rwhod.8 rxformat.8 sa.8 savecore.8 sendmail.8 shutdown.8 \
--- 24,30 ----
  	gettable.8 getty.8 htable.8 icheck.8 ifconfig.8 implog.8 \
  	implogd.8 inetd.8 init.8 intro.8 kgmon.8 lpc.8 lpd.8 makedev.8 \
  	makekey.8 mkfs.8 mkhosts.8 mklost+found.8 mknod.8 mkproto.8 \
! 	mount.8 named.8 ncheck.8 newfs.8 pac.8 pstat.8 quot.8 \
  	quotacheck.8 quotaon.8 rc.8 rdump.8 reboot.8 renice.8 repquota.8 \
  	restor.8 rexecd.8 rmt.8 route.8 routed.8 rrestore.8 \
  	rwhod.8 rxformat.8 sa.8 savecore.8 sendmail.8 shutdown.8 \
***************
*** 38,44 ****
  	gettable.0 getty.0 htable.0 icheck.0 ifconfig.0 implog.0 \
  	implogd.0 inetd.0 init.0 intro.0 kgmon.0 lpc.0 lpd.0 makedev.0 \
  	makekey.0 mkfs.0 mkhosts.0 mklost+found.0 mknod.0 mkproto.0 \
! 	mount.0 named.0 ncheck.0 newfs.0 pac.0 ping.0 pstat.0 quot.0 \
  	quotacheck.0 quotaon.0 rc.0 rdump.0 reboot.0 renice.0 repquota.0 \
  	restor.0 rexecd.0 rmt.0 route.0 routed.0 rrestore.0 \
  	rwhod.0 rxformat.0 sa.0 savecore.0 sendmail.0 shutdown.0 \
--- 38,44 ----
  	gettable.0 getty.0 htable.0 icheck.0 ifconfig.0 implog.0 \
  	implogd.0 inetd.0 init.0 intro.0 kgmon.0 lpc.0 lpd.0 makedev.0 \
  	makekey.0 mkfs.0 mkhosts.0 mklost+found.0 mknod.0 mkproto.0 \
! 	mount.0 named.0 ncheck.0 newfs.0 pac.0 pstat.0 quot.0 \
  	quotacheck.0 quotaon.0 rc.0 rdump.0 reboot.0 renice.0 repquota.0 \
  	restor.0 rexecd.0 rmt.0 route.0 routed.0 rrestore.0 \
  	rwhod.0 rxformat.0 sa.0 savecore.0 sendmail.0 shutdown.0 \
*** /usr/src/sys/conf/GENERIC.old	Wed Nov 22 21:23:34 1995
--- /usr/src/sys/conf/GENERIC	Thu Dec 14 21:57:41 1995
***************
*** 1,3 ****
--- 1,4 ----
+ # 1995/12/14 - RX added to GENERIC kernel.
  # 1995/07/21 - XP_PROBE removed.
  #
  # Machine configuration file for 2.11BSD distributed kernel.
***************
*** 148,154 ****
  
  NRL		2		# RL01/02
  
! NRX		0		# RX02
  
  NSI		0		# SI 9500 driver for CDC 9766 disks
  
--- 149,155 ----
  
  NRL		2		# RL01/02
  
! NRX		2		# RX02
  
  NSI		0		# SI 9500 driver for CDC 9766 disks
  
*** /usr/src/sys/conf/Make.nsunix.old	Tue May  9 22:06:19 1995
--- /usr/src/sys/conf/Make.nsunix	Sun Dec 24 14:29:55 1995
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.3 (2.11BSD GTE) 1995/05/09
  #
  #########################################################
  # Networking, separate I/D kernel			#
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.5	(2.11BSD GTE) 1995/12/24
  #
  #########################################################
  # Networking, separate I/D kernel			#
***************
*** 62,73 ****
  
  BASE=	br.o cons.o dh.o dhu.o dhv.o dr.o dz.o hk.o ht.o init_sysent.o \
  	kern_clock.o kern_descrip.o kern_mman.o kern_proc.o kern_prot.o \
! 	kern_subr.o kern_synch.o kern_xxx.o lp.o machdep.o ra.o ram.o \
  	rk.o rl.o rx.o si.o subr_rmap.o sys_inode.o sys_kern.o \
  	tm.o ts.o tty.o tty_conf.o tty_subr.o tty_tb.o ufs_alloc.o \
! 	ufs_bio.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_namei.o \
! 	vm_proc.o vm_sched.o vm_swap.o vm_swp.o vm_text.o xp.o quota_subr.o
! OV1=	sys_generic.o ufs_syscalls.o
  OV2=	kern_acct.o kern_exec.o kern_exit.o kern_fork.o kern_resource.o
  OV3=	kern_time.o sys_process.o ufs_mount.o ufs_subr.o uipc_syscalls.o
  OV4=	dkbad.o kern_sig.o mem.o subr_xxx.o trap.o tty_pty.o tty_tty.o
--- 62,73 ----
  
  BASE=	br.o cons.o dh.o dhu.o dhv.o dr.o dz.o hk.o ht.o init_sysent.o \
  	kern_clock.o kern_descrip.o kern_mman.o kern_proc.o kern_prot.o \
! 	kern_subr.o kern_synch.o lp.o machdep.o ra.o ram.o \
  	rk.o rl.o rx.o si.o subr_rmap.o sys_inode.o sys_kern.o \
  	tm.o ts.o tty.o tty_conf.o tty_subr.o tty_tb.o ufs_alloc.o \
! 	ufs_bio.o ufs_fio.o ufs_inode.o ufs_namei.o \
! 	vm_proc.o vm_sched.o vm_swap.o xp.o quota_subr.o
! OV1=	sys_generic.o ufs_syscalls.o ufs_syscalls2.o
  OV2=	kern_acct.o kern_exec.o kern_exit.o kern_fork.o kern_resource.o
  OV3=	kern_time.o sys_process.o ufs_mount.o ufs_subr.o uipc_syscalls.o
  OV4=	dkbad.o kern_sig.o mem.o subr_xxx.o trap.o tty_pty.o tty_tty.o
***************
*** 75,83 ****
  	sys_pipe.o
  # OV6 gets the (hopefully) never used routines
  OV6=	clock.o dn.o init_main.o kern_pdp.o machdep2.o subr_prf.o syscalls.o \
! 	subr_log.o toy.o
! OV7=	tmscp.o kern_sysctl.o
! OV8=	mch_fpsim.o ingreslock.o ufs_disksubr.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
  	${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \
--- 75,84 ----
  	sys_pipe.o
  # OV6 gets the (hopefully) never used routines
  OV6=	clock.o dn.o init_main.o kern_pdp.o machdep2.o subr_prf.o syscalls.o \
! 	subr_log.o toy.o vm_swp.o
! OV7=	ufs_disksubr.o ufs_dsort.o
! OV8=	mch_fpsim.o kern_sysctl.o kern_xxx.o ingreslock.o vm_text.o
! OV9=	tmscp.o tmscpdump.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
  	${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \
***************
*** 119,124 ****
--- 120,126 ----
  # d.netnix.o must be the last object file in the dependency list!
  netnix: d.netnix.o
  	-ld -X -i -o netnix ${NETOBJ} d.netnix.o
+ 	size netnix
  	@echo Compacting symbol table
  	-symcompact netnix
  	@echo Compacting strings table - this will take a few minutes
***************
*** 125,131 ****
  	-strcompact netnix
  	@echo rearranging symbols
  	-symorder ../pdp/symbols.sort netnix
- 	size netnix
  
  # Resolve all references between the kernel and the net.  Always regenerate!!!
  # This was a constant source of problems during development.  Should really
--- 127,132 ----
***************
*** 133,139 ****
  # have enough table space.
  d.unix.o d.netnix.o: netbind FRC
  	ld -q -r -d -X -i -o unix.o ${LD_KOBJ}
! 	ld -q -r -d -X -o netnix.o ${NETOBJ}
  	./netbind unix.o netnix.o
  	rm unix.o netnix.o
  	${AS} - -o d.unix.o d.unix.s
--- 134,140 ----
  # have enough table space.
  d.unix.o d.netnix.o: netbind FRC
  	ld -q -r -d -X -i -o unix.o ${LD_KOBJ}
! 	ld -q -r -d -X -i -o netnix.o ${NETOBJ}
  	./netbind unix.o netnix.o
  	rm unix.o netnix.o
  	${AS} - -o d.unix.o d.unix.s
*** /usr/src/sys/conf/Make.pdpuba.old	Sun Dec 22 16:16:21 1991
--- /usr/src/sys/conf/Make.pdpuba	Thu Dec 14 21:53:07 1995
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	%W% (Berkeley) %G%
  #
  U=	../pdpuba
  VPATH=	../pdpuba
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.0  (2.11BSD) 1995/12/14
  #
  U=	../pdpuba
  VPATH=	../pdpuba
***************
*** 16,24 ****
  
  CFILES=	${U}/br.c ${U}/dh.c ${U}/dn.c ${U}/dhu.c ${U}/dhv.c ${U}/dkbad.c \
  	${U}/dr.c ${U}/dz.c ${U}/hk.c ${U}/ht.c ${U}/lp.c ${U}/ra.c ${U}/rk.c \
! 	${U}/rl.c ${U}/rx.c ${U}/si.c ${U}/tm.c ${U}/tmscp.c ${U}/ts.c ${U}/xp.c
  OBJS=	br.o dh.o dhu.o dhv.o dkbad.o dn.o dr.o dz.o hk.o ht.o lp.o ra.o rk.o \
! 	rl.o rx.o si.o tm.o tmscp.o ts.o xp.o dn.o
  
  .c.o:
  	${CC} ${CFLAGS} -S $*.c
--- 16,25 ----
  
  CFILES=	${U}/br.c ${U}/dh.c ${U}/dn.c ${U}/dhu.c ${U}/dhv.c ${U}/dkbad.c \
  	${U}/dr.c ${U}/dz.c ${U}/hk.c ${U}/ht.c ${U}/lp.c ${U}/ra.c ${U}/rk.c \
! 	${U}/rl.c ${U}/rx.c ${U}/si.c ${U}/tm.c ${U}/tmscp.c ${U}/tmscpdump.c \
! 	${U}/ts.c ${U}/xp.c
  OBJS=	br.o dh.o dhu.o dhv.o dkbad.o dn.o dr.o dz.o hk.o ht.o lp.o ra.o rk.o \
! 	rl.o rx.o si.o tm.o tmscp.o tmscpdump.o ts.o xp.o dn.o
  
  .c.o:
  	${CC} ${CFLAGS} -S $*.c
***************
*** 33,36 ****
  
  # DO NOT DELETE THIS LINE -- mkdep uses it.
  # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
- 
--- 34,36 ----
*** /usr/src/sys/conf/Make.sunix.old	Thu Nov 23 09:32:26 1995
--- /usr/src/sys/conf/Make.sunix	Sun Dec 24 15:55:25 1995
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.3 (2.11BSD GTE) 1995/11/22
  #
  #########################################################
  # Non-network, but separate I/D kernel			#
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.4 (2.11BSD GTE) 1995/12/24
  #
  #########################################################
  # Non-network, but separate I/D kernel			#
***************
*** 55,69 ****
  	ufs_subr.o xp.o
  OV1=	sys_generic.o ufs_syscalls.o mem.o
  OV2=	kern_acct.o kern_exec.o kern_exit.o kern_fork.o kern_resource.o
! OV3=	clock.o cons.o kern_pdp.o kern_time.o \
! 	kern_xxx.o machdep2.o quota_sys.o subr_prf.o sys_process.o \
  	syscalls.o ufs_mount.o
  OV4=	hk.o init_main.o kern_prot.o tty_pty.o quota_kern.o quota_subr.o \
  	quota_ufs.o subr_log.o vm_swp.o vm_swap.o vm_proc.o toy.o
  OV5=	ht.o tm.o ts.o
! OV6=	tmscp.o vm_text.o
  OV7=	rl.o mch_fpsim.o ingreslock.o ufs_disksubr.o
! OV8=	rx.o kern_sysctl.o vm_sched.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
  	${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \
--- 55,70 ----
  	ufs_subr.o xp.o
  OV1=	sys_generic.o ufs_syscalls.o mem.o
  OV2=	kern_acct.o kern_exec.o kern_exit.o kern_fork.o kern_resource.o
! OV3=	clock.o cons.o kern_time.o \
! 	machdep2.o quota_sys.o subr_prf.o sys_process.o \
  	syscalls.o ufs_mount.o
  OV4=	hk.o init_main.o kern_prot.o tty_pty.o quota_kern.o quota_subr.o \
  	quota_ufs.o subr_log.o vm_swp.o vm_swap.o vm_proc.o toy.o
  OV5=	ht.o tm.o ts.o
! OV6=	tmscp.o tmscpdump.o
  OV7=	rl.o mch_fpsim.o ingreslock.o ufs_disksubr.o
! OV8=	rx.o kern_sysctl.o vm_sched.o vm_text.o
! OV9=	kern_pdp.o kern_xxx.o ufs_syscalls2.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
  	${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \
*** /usr/src/sys/conf/Make.sys.old	Thu Apr 13 21:45:50 1995
--- /usr/src/sys/conf/Make.sys	Sun Dec 24 14:25:09 1995
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.2 (2.11BSD GTE) 1994/04/13
  #
  S=	../sys
  VPATH=	../sys
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.2 (2.11BSD GTE) 1995/12/24
  #
  S=	../sys
  VPATH=	../sys
***************
*** 30,36 ****
  	${S}/ufs_alloc.c ${S}/ufs_bio.c ${S}/ufs_bmap.c			\
  	${S}/ufs_dsort.c ${S}/ufs_fio.c ${S}/ufs_inode.c		\
  	${S}/ufs_mount.c ${S}/ufs_namei.c ${S}/ufs_subr.c		\
! 	${S}/ufs_disksubr.c 						\
  	${S}/ufs_syscalls.c ${S}/uipc_syscalls.c ${S}/vm_proc.c		\
  	${S}/vm_sched.c ${S}/vm_swap.c ${S}/vm_swp.c ${S}/vm_text.c
  OBJS=	init_main.o init_sysent.o kern_acct.o kern_clock.o		\
--- 30,36 ----
  	${S}/ufs_alloc.c ${S}/ufs_bio.c ${S}/ufs_bmap.c			\
  	${S}/ufs_dsort.c ${S}/ufs_fio.c ${S}/ufs_inode.c		\
  	${S}/ufs_mount.c ${S}/ufs_namei.c ${S}/ufs_subr.c		\
! 	${S}/ufs_disksubr.c ${S}/ufs_syscalls2.c			\
  	${S}/ufs_syscalls.c ${S}/uipc_syscalls.c ${S}/vm_proc.c		\
  	${S}/vm_sched.c ${S}/vm_swap.c ${S}/vm_swp.c ${S}/vm_text.c
  OBJS=	init_main.o init_sysent.o kern_acct.o kern_clock.o		\
***************
*** 44,50 ****
  	tty_subr.o tty_tb.o tty_tty.o ufs_alloc.o ufs_bio.o ufs_bmap.o	\
  	ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o	\
  	ufs_subr.o ufs_syscalls.o uipc_syscalls.o vm_proc.o vm_sched.o	\
! 	ufs_disksubr.o							\
  	vm_swap.o vm_swp.o vm_text.o
  
  .c.o:
--- 44,50 ----
  	tty_subr.o tty_tb.o tty_tty.o ufs_alloc.o ufs_bio.o ufs_bmap.o	\
  	ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o	\
  	ufs_subr.o ufs_syscalls.o uipc_syscalls.o vm_proc.o vm_sched.o	\
! 	ufs_disksubr.o ufs_syscalls2.o					\
  	vm_swap.o vm_swp.o vm_text.o
  
  .c.o:
*** /usr/src/sys/conf/Make.unix.old	Thu Apr 13 21:48:53 1995
--- /usr/src/sys/conf/Make.unix	Sun Dec 24 14:30:58 1995
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.2 (2.11BSD GTE) 1995/04/13
  #
  #########################################################
  # Non-networking, non-separate I/D kernel		#
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.4 (2.11BSD GTE) 1995/12/24
  #
  #########################################################
  # Non-networking, non-separate I/D kernel		#
***************
*** 57,66 ****
  	machdep2.o mem.o quota_kern.o quota_subr.o quota_sys.o \
  	quota_ufs.o ra.o ram.o rk.o rl.o rx.o si.o subr_prf.o subr_rmap.o \
  	subr_xxx.o sys_generic.o sys_inode.o sys_kern.o toy.o \
! 	sys_pipe.o sys_process.o syscalls.o tm.o trap.o tmscp.o ts.o tty.o \
  	tty_conf.o tty_pty.o tty_subr.o tty_tb.o tty_tty.o ufs_alloc.o \
  	ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o \
! 	ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o \
  	vm_proc.o vm_sched.o vm_swap.o vm_swp.o vm_text.o xp.o subr_log.o \
  	kern_sysctl.o ingreslock.o ufs_disksubr.o
  
--- 57,67 ----
  	machdep2.o mem.o quota_kern.o quota_subr.o quota_sys.o \
  	quota_ufs.o ra.o ram.o rk.o rl.o rx.o si.o subr_prf.o subr_rmap.o \
  	subr_xxx.o sys_generic.o sys_inode.o sys_kern.o toy.o \
! 	sys_pipe.o sys_process.o syscalls.o tm.o trap.o tmscp.o tmscpdump.o \
! 	ts.o tty.o \
  	tty_conf.o tty_pty.o tty_subr.o tty_tb.o tty_tty.o ufs_alloc.o \
  	ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o \
! 	ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o ufs_syscalls2.o \
  	vm_proc.o vm_sched.o vm_swap.o vm_swp.o vm_text.o xp.o subr_log.o \
  	kern_sysctl.o ingreslock.o ufs_disksubr.o