Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Apr 2004 22:48:03 -0700 (PDT)
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 50572 for review
Message-ID:  <200404070548.i375m3NQ097820@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50572

Change 50572 by imp@imp_pacopaco on 2004/04/06 22:47:21

	IFC @50567

Affected files ...

.. //depot/projects/power/sys/dev/sio/sio.c#6 integrate
.. //depot/projects/power/sys/nfs/nfs_common.c#2 integrate
.. //depot/projects/power/sys/nfs/nfs_common.h#2 integrate
.. //depot/projects/power/sys/nfs/nfsproto.h#3 integrate
.. //depot/projects/power/sys/nfs/rpcv2.h#3 integrate
.. //depot/projects/power/sys/nfs/xdr_subs.h#2 integrate
.. //depot/projects/power/sys/nfsclient/nfs.h#5 integrate
.. //depot/projects/power/sys/nfsclient/nfs_bio.c#6 integrate
.. //depot/projects/power/sys/nfsclient/nfs_diskless.c#3 integrate
.. //depot/projects/power/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/power/sys/nfsclient/nfs_node.c#4 integrate
.. //depot/projects/power/sys/nfsclient/nfs_socket.c#6 integrate
.. //depot/projects/power/sys/nfsclient/nfs_subs.c#6 integrate
.. //depot/projects/power/sys/nfsclient/nfs_vfsops.c#6 integrate
.. //depot/projects/power/sys/nfsclient/nfs_vnops.c#6 integrate
.. //depot/projects/power/sys/nfsclient/nfsargs.h#3 integrate
.. //depot/projects/power/sys/nfsclient/nfsdiskless.h#2 integrate
.. //depot/projects/power/sys/nfsclient/nfsm_subs.h#3 integrate
.. //depot/projects/power/sys/nfsclient/nfsmount.h#4 integrate
.. //depot/projects/power/sys/nfsclient/nfsnode.h#4 integrate
.. //depot/projects/power/sys/nfsclient/nfsstats.h#2 integrate
.. //depot/projects/power/sys/nfsserver/nfs.h#4 integrate
.. //depot/projects/power/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/power/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/power/sys/nfsserver/nfs_srvsock.c#5 integrate
.. //depot/projects/power/sys/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/power/sys/nfsserver/nfs_syscalls.c#5 integrate
.. //depot/projects/power/sys/nfsserver/nfsm_subs.h#2 integrate
.. //depot/projects/power/sys/nfsserver/nfsrvcache.h#2 integrate
.. //depot/projects/power/sys/nfsserver/nfsrvstats.h#2 integrate
.. //depot/projects/power/sys/pc98/pc98/clock.c#6 integrate
.. //depot/projects/power/sys/pc98/pc98/fdreg.h#2 integrate
.. //depot/projects/power/sys/pc98/pc98/isa_dma.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/nmi.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/pc98.h#2 integrate
.. //depot/projects/power/sys/pc98/pc98/sio.c#6 integrate
.. //depot/projects/power/sys/pc98/pc98/wd.c#4 integrate
.. //depot/projects/power/sys/pc98/pc98/wdreg.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/endian.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/float.h#3 integrate
.. //depot/projects/power/sys/powerpc/include/ieee.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/in_cksum.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/limits.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/ptrace.h#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/bcopy.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/power/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/power/sys/powerpc/powerpc/uio_machdep.c#2 integrate
.. //depot/projects/power/sys/rpc/rpcclnt.h#3 integrate
.. //depot/projects/power/sys/rpc/rpcm_subs.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/_types.h#3 integrate
.. //depot/projects/power/sys/sparc64/include/asm.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/bus_common.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/cache.h#3 integrate
.. //depot/projects/power/sys/sparc64/include/cpu.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/eeprom.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/endian.h#3 integrate
.. //depot/projects/power/sys/sparc64/include/float.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/ieee.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/in_cksum.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/iommureg.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/pmap.h#4 integrate
.. //depot/projects/power/sys/sparc64/include/proc.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/ptrace.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/reg.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/signal.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/sysarch.h#3 integrate
.. //depot/projects/power/sys/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/power/sys/sparc64/sbus/sbusvar.h#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/bus_machdep.c#4 integrate
.. //depot/projects/power/sys/sparc64/sparc64/cache.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/eeprom.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/in_cksum.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/intr_machdep.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/machdep.c#5 integrate
.. //depot/projects/power/sys/sparc64/sparc64/mem.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/uio_machdep.c#3 integrate
.. //depot/projects/power/sys/sys/_iovec.h#2 integrate
.. //depot/projects/power/sys/sys/_sigset.h#2 integrate
.. //depot/projects/power/sys/sys/_timespec.h#2 integrate
.. //depot/projects/power/sys/sys/acct.h#2 integrate
.. //depot/projects/power/sys/sys/bio.h#4 integrate
.. //depot/projects/power/sys/sys/bitstring.h#2 integrate
.. //depot/projects/power/sys/sys/buf.h#5 integrate
.. //depot/projects/power/sys/sys/callout.h#3 integrate
.. //depot/projects/power/sys/sys/cdefs.h#5 integrate
.. //depot/projects/power/sys/sys/clist.h#2 integrate
.. //depot/projects/power/sys/sys/conf.h#4 integrate
.. //depot/projects/power/sys/sys/cons.h#4 integrate
.. //depot/projects/power/sys/sys/ctype.h#2 integrate
.. //depot/projects/power/sys/sys/dir.h#3 integrate
.. //depot/projects/power/sys/sys/dirent.h#2 integrate
.. //depot/projects/power/sys/sys/disklabel.h#2 integrate
.. //depot/projects/power/sys/sys/diskmbr.h#2 integrate
.. //depot/projects/power/sys/sys/diskpc98.h#2 integrate
.. //depot/projects/power/sys/sys/dkstat.h#2 integrate
.. //depot/projects/power/sys/sys/domain.h#3 integrate
.. //depot/projects/power/sys/sys/errno.h#2 integrate
.. //depot/projects/power/sys/sys/exec.h#3 integrate
.. //depot/projects/power/sys/sys/fbio.h#2 integrate
.. //depot/projects/power/sys/sys/fcntl.h#2 integrate
.. //depot/projects/power/sys/sys/file.h#2 integrate
.. //depot/projects/power/sys/sys/filedesc.h#5 integrate
.. //depot/projects/power/sys/sys/filio.h#2 integrate
.. //depot/projects/power/sys/sys/gmon.h#2 integrate
.. //depot/projects/power/sys/sys/imgact.h#2 integrate
.. //depot/projects/power/sys/sys/imgact_aout.h#2 integrate
.. //depot/projects/power/sys/sys/ioccom.h#2 integrate
.. //depot/projects/power/sys/sys/ioctl.h#3 integrate
.. //depot/projects/power/sys/sys/ioctl_compat.h#2 integrate
.. //depot/projects/power/sys/sys/ipc.h#2 integrate
.. //depot/projects/power/sys/sys/ktrace.h#2 integrate
.. //depot/projects/power/sys/sys/libkern.h#3 integrate
.. //depot/projects/power/sys/sys/limits.h#3 integrate
.. //depot/projects/power/sys/sys/lockf.h#2 integrate
.. //depot/projects/power/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/power/sys/sys/malloc.h#2 integrate
.. //depot/projects/power/sys/sys/mbuf.h#9 integrate
.. //depot/projects/power/sys/sys/mdioctl.h#3 integrate
.. //depot/projects/power/sys/sys/mman.h#2 integrate
.. //depot/projects/power/sys/sys/mount.h#5 integrate
.. //depot/projects/power/sys/sys/msgbuf.h#3 integrate
.. //depot/projects/power/sys/sys/mtio.h#2 integrate
.. //depot/projects/power/sys/sys/namei.h#2 integrate
.. //depot/projects/power/sys/sys/nlist_aout.h#2 integrate
.. //depot/projects/power/sys/sys/param.h#6 integrate
.. //depot/projects/power/sys/sys/proc.h#10 integrate
.. //depot/projects/power/sys/sys/protosw.h#4 integrate
.. //depot/projects/power/sys/sys/ptrace.h#3 integrate
.. //depot/projects/power/sys/sys/queue.h#3 integrate
.. //depot/projects/power/sys/sys/reboot.h#3 integrate
.. //depot/projects/power/sys/sys/resource.h#4 integrate
.. //depot/projects/power/sys/sys/resourcevar.h#4 integrate
.. //depot/projects/power/sys/sys/select.h#2 integrate
.. //depot/projects/power/sys/sys/selinfo.h#3 integrate
.. //depot/projects/power/sys/sys/sigio.h#2 integrate
.. //depot/projects/power/sys/sys/signal.h#2 integrate
.. //depot/projects/power/sys/sys/signalvar.h#4 integrate
.. //depot/projects/power/sys/sys/socket.h#5 integrate
.. //depot/projects/power/sys/sys/socketvar.h#5 integrate
.. //depot/projects/power/sys/sys/sockio.h#3 integrate
.. //depot/projects/power/sys/sys/stat.h#2 integrate
.. //depot/projects/power/sys/sys/sun_disklabel.h#2 integrate
.. //depot/projects/power/sys/sys/sysctl.h#5 integrate
.. //depot/projects/power/sys/sys/sysent.h#3 integrate
.. //depot/projects/power/sys/sys/syslimits.h#3 integrate
.. //depot/projects/power/sys/sys/syslog.h#2 integrate
.. //depot/projects/power/sys/sys/systm.h#5 integrate
.. //depot/projects/power/sys/sys/termios.h#2 integrate
.. //depot/projects/power/sys/sys/time.h#4 integrate
.. //depot/projects/power/sys/sys/timeb.h#2 integrate
.. //depot/projects/power/sys/sys/times.h#2 integrate
.. //depot/projects/power/sys/sys/timespec.h#2 integrate
.. //depot/projects/power/sys/sys/tty.h#2 integrate
.. //depot/projects/power/sys/sys/ttychars.h#2 integrate
.. //depot/projects/power/sys/sys/ttycom.h#3 integrate
.. //depot/projects/power/sys/sys/ttydefaults.h#2 integrate
.. //depot/projects/power/sys/sys/ttydev.h#2 integrate
.. //depot/projects/power/sys/sys/types.h#3 integrate
.. //depot/projects/power/sys/sys/ucred.h#3 integrate
.. //depot/projects/power/sys/sys/uio.h#5 integrate
.. //depot/projects/power/sys/sys/un.h#3 integrate
.. //depot/projects/power/sys/sys/unistd.h#2 integrate
.. //depot/projects/power/sys/sys/unpcb.h#2 integrate
.. //depot/projects/power/sys/sys/user.h#3 integrate
.. //depot/projects/power/sys/sys/utsname.h#2 integrate
.. //depot/projects/power/sys/sys/vmmeter.h#2 integrate
.. //depot/projects/power/sys/sys/vnode.h#9 integrate
.. //depot/projects/power/sys/sys/wait.h#3 integrate
.. //depot/projects/power/sys/tools/makeobjops.awk#3 integrate
.. //depot/projects/power/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_balloc.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_extern.h#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_inode.c#3 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_subr.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_tables.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/power/sys/ufs/ffs/fs.h#4 integrate
.. //depot/projects/power/sys/ufs/ufs/dir.h#2 integrate
.. //depot/projects/power/sys/ufs/ufs/inode.h#2 integrate
.. //depot/projects/power/sys/ufs/ufs/quota.h#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_bmap.c#3 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_extern.h#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_ihash.c#3 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_inode.c#3 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_lookup.c#3 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_quota.c#4 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_vfsops.c#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/power/sys/ufs/ufs/ufsmount.h#2 integrate

Differences ...

==== //depot/projects/power/sys/dev/sio/sio.c#6 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.423 2004/03/18 02:36:41 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.424 2004/04/07 04:59:55 imp Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
@@ -1792,9 +1792,20 @@
 			}
 		}
 		line_status = inb(com->line_status_port);
-
+		if (line_status == 0xff) {
+			printf("sio%d: spouting nonsense -- disabled.\n",
+			    com->unit);
+			com->gone = 1;
+			break;
+		}
 		/* input event? (check first to help avoid overruns) */
 		while (line_status & LSR_RCV_MASK) {
+			if (line_status == 0xff) {
+				printf("sio%d: linestats bogus -- disabled.\n",
+				    com->unit);
+				com->gone = 1;
+				return;
+			}
 			/* break/unnattached error bits or real input? */
 			if (!(line_status & LSR_RXRDY))
 				recv_data = 0;

==== //depot/projects/power/sys/nfs/nfs_common.c#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfs/nfs_common.c,v 1.114 2003/02/19 05:47:38 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/nfs/nfs_common.c,v 1.115 2004/04/07 04:59:56 imp Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for

==== //depot/projects/power/sys/nfs/nfs_common.h#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfs/nfs_common.h,v 1.34 2001/12/18 01:22:02 iedowse Exp $
+ * $FreeBSD: src/sys/nfs/nfs_common.h,v 1.35 2004/04/07 04:59:56 imp Exp $
  */
 
 

==== //depot/projects/power/sys/nfs/nfsproto.h#3 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfs/nfsproto.h,v 1.9 2003/11/14 20:54:07 alfred Exp $
+ * $FreeBSD: src/sys/nfs/nfsproto.h,v 1.10 2004/04/07 04:59:56 imp Exp $
  */
 
 #ifndef _NFS_NFSPROTO_H_

==== //depot/projects/power/sys/nfs/rpcv2.h#3 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfs/rpcv2.h,v 1.12 2003/11/14 20:54:07 alfred Exp $
+ * $FreeBSD: src/sys/nfs/rpcv2.h,v 1.13 2004/04/07 04:59:56 imp Exp $
  */
 
 

==== //depot/projects/power/sys/nfs/xdr_subs.h#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfs/xdr_subs.h,v 1.13 1999/08/28 00:50:04 peter Exp $
+ * $FreeBSD: src/sys/nfs/xdr_subs.h,v 1.14 2004/04/07 04:59:56 imp Exp $
  */
 
 

==== //depot/projects/power/sys/nfsclient/nfs.h#5 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: src/sys/nfsclient/nfs.h,v 1.79 2004/03/25 21:48:08 rees Exp $
+ * $FreeBSD: src/sys/nfsclient/nfs.h,v 1.80 2004/04/07 04:59:56 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFS_H_

==== //depot/projects/power/sys/nfsclient/nfs_bio.c#6 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.128 2004/03/11 18:02:35 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.129 2004/04/07 04:59:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/power/sys/nfsclient/nfs_diskless.c#3 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.6 2003/11/14 20:54:08 alfred Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.7 2004/04/07 04:59:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/power/sys/nfsclient/nfs_nfsiod.c#3 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_nfsiod.c,v 1.79 2003/11/14 20:54:08 alfred Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_nfsiod.c,v 1.80 2004/04/07 04:59:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/power/sys/nfsclient/nfs_node.c#4 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.65 2003/11/14 20:54:08 alfred Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.66 2004/04/07 04:59:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/power/sys/nfsclient/nfs_socket.c#6 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.106 2004/04/04 19:24:08 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.107 2004/04/07 04:59:56 imp Exp $");
 
 /*
  * Socket operations for use by nfs

==== //depot/projects/power/sys/nfsclient/nfs_subs.c#6 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.124 2004/03/25 21:48:08 rees Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.125 2004/04/07 04:59:56 imp Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for

==== //depot/projects/power/sys/nfsclient/nfs_vfsops.c#6 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.148 2004/03/01 03:14:23 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.149 2004/04/07 04:59:56 imp Exp $");
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"

==== //depot/projects/power/sys/nfsclient/nfs_vnops.c#6 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.217 2004/04/03 17:23:46 peadar Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.218 2004/04/07 04:59:57 imp Exp $");
 
 /*
  * vnode op calls for Sun NFS version 2 and 3

==== //depot/projects/power/sys/nfsclient/nfsargs.h#3 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: src/sys/nfsclient/nfsargs.h,v 1.65 2003/11/14 20:54:09 alfred Exp $
+ * $FreeBSD: src/sys/nfsclient/nfsargs.h,v 1.66 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSARGS_H_

==== //depot/projects/power/sys/nfsclient/nfsdiskless.h#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfsclient/nfsdiskless.h,v 1.15 2003/08/15 12:04:02 phk Exp $
+ * $FreeBSD: src/sys/nfsclient/nfsdiskless.h,v 1.16 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSDISKLESS_H_

==== //depot/projects/power/sys/nfsclient/nfsm_subs.h#3 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfsclient/nfsm_subs.h,v 1.33 2003/11/14 20:54:09 alfred Exp $
+ * $FreeBSD: src/sys/nfsclient/nfsm_subs.h,v 1.34 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSM_SUBS_H_

==== //depot/projects/power/sys/nfsclient/nfsmount.h#4 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfsclient/nfsmount.h,v 1.25 2003/11/22 02:21:49 alfred Exp $
+ * $FreeBSD: src/sys/nfsclient/nfsmount.h,v 1.26 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSMOUNT_H_

==== //depot/projects/power/sys/nfsclient/nfsnode.h#4 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD: src/sys/nfsclient/nfsnode.h,v 1.41 2003/11/22 02:21:49 alfred Exp $
+ * $FreeBSD: src/sys/nfsclient/nfsnode.h,v 1.42 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSNODE_H_

==== //depot/projects/power/sys/nfsclient/nfsstats.h#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: src/sys/nfsclient/nfsstats.h,v 1.63 2001/09/18 23:31:53 peter Exp $
+ * $FreeBSD: src/sys/nfsclient/nfsstats.h,v 1.64 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSSTATS_H_

==== //depot/projects/power/sys/nfsserver/nfs.h#4 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.72 2004/04/06 01:58:58 rwatson Exp $
+ * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.73 2004/04/07 04:59:57 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFS_H_

==== //depot/projects/power/sys/nfsserver/nfs_serv.c#4 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.138 2004/03/11 18:02:36 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.139 2004/04/07 04:59:57 imp Exp $");
 
 /*
  * nfs version 2 and 3 server calls to vnode ops

==== //depot/projects/power/sys/nfsserver/nfs_srvcache.c#3 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.36 2004/03/01 03:14:23 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.37 2004/04/07 04:59:58 imp Exp $");
 
 /*
  * Reference: Chet Juszczak, "Improving the Performance and Correctness

==== //depot/projects/power/sys/nfsserver/nfs_srvsock.c#5 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.88 2004/04/04 19:13:35 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.89 2004/04/07 04:59:58 imp Exp $");
 
 /*
  * Socket operations for use by nfs

==== //depot/projects/power/sys/nfsserver/nfs_srvsubs.c#4 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.124 2004/03/07 16:28:31 kan Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.125 2004/04/07 04:59:58 imp Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for

==== //depot/projects/power/sys/nfsserver/nfs_syscalls.c#5 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.95 2004/04/04 19:24:08 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.96 2004/04/07 04:59:58 imp Exp $");
 
 #include "opt_inet6.h"
 #include "opt_mac.h"

==== //depot/projects/power/sys/nfsserver/nfsm_subs.h#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfsserver/nfsm_subs.h,v 1.34 2002/10/31 22:35:03 jeff Exp $
+ * $FreeBSD: src/sys/nfsserver/nfsm_subs.h,v 1.35 2004/04/07 04:59:58 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSM_SUBS_H_

==== //depot/projects/power/sys/nfsserver/nfsrvcache.h#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfsserver/nfsrvcache.h,v 1.15 2001/09/18 23:32:03 peter Exp $
+ * $FreeBSD: src/sys/nfsserver/nfsrvcache.h,v 1.16 2004/04/07 04:59:58 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVCACHE_H_

==== //depot/projects/power/sys/nfsserver/nfsrvstats.h#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: src/sys/nfsserver/nfsrvstats.h,v 1.63 2001/09/18 23:32:03 peter Exp $
+ * $FreeBSD: src/sys/nfsserver/nfsrvstats.h,v 1.64 2004/04/07 04:59:58 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVSTATS_H_

==== //depot/projects/power/sys/pc98/pc98/clock.c#6 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.136 2004/03/29 12:51:46 nyan Exp $
+ * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.137 2004/04/07 04:59:58 imp Exp $
  */
 
 /*

==== //depot/projects/power/sys/pc98/pc98/fdreg.h#2 (text+ko) ====

@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -31,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/pc98/pc98/fdreg.h,v 1.10 2001/12/16 09:00:03 nyan Exp $
+ * $FreeBSD: src/sys/pc98/pc98/fdreg.h,v 1.11 2004/04/07 04:59:58 imp Exp $
  */
 
 /*

==== //depot/projects/power/sys/pc98/pc98/isa_dma.c#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- * $FreeBSD: src/sys/pc98/pc98/isa_dma.c,v 1.15 2002/04/29 07:43:15 peter Exp $
+ * $FreeBSD: src/sys/pc98/pc98/isa_dma.c,v 1.16 2004/04/07 04:59:58 imp Exp $
  */
 
 /*

==== //depot/projects/power/sys/pc98/pc98/nmi.c#2 (text+ko) ====

@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -37,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/pc98/nmi.c,v 1.1 2003/11/04 13:01:41 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/nmi.c,v 1.2 2004/04/07 04:59:58 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/syslog.h>

==== //depot/projects/power/sys/pc98/pc98/pc98.h#2 (text+ko) ====

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404070548.i375m3NQ097820>