PERFORCE change 50692 for review
Warner Losh
imp at FreeBSD.org
Thu Apr 8 22:21:30 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=50692
Change 50692 by imp at imp_pacopaco on 2004/04/08 22:21:12
IFC @50689
Affected files ...
.. //depot/projects/power/sys/alpha/alpha/timerreg.h#2 integrate
.. //depot/projects/power/sys/boot/arc/lib/elf_freebsd.c#3 integrate
.. //depot/projects/power/sys/boot/common/newvers.sh#2 integrate
.. //depot/projects/power/sys/compat/ndis/kern_ndis.c#7 integrate
.. //depot/projects/power/sys/conf/files#8 integrate
.. //depot/projects/power/sys/conf/newvers.sh#5 integrate
.. //depot/projects/power/sys/conf/systags.sh#3 integrate
.. //depot/projects/power/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/power/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/power/sys/dev/acpica/acpi.c#16 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pci.c#10 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/power/sys/dev/fb/gallant12x22.h#2 integrate
.. //depot/projects/power/sys/dev/fxp/if_fxp.c#7 integrate
.. //depot/projects/power/sys/dev/ic/i8251.h#2 integrate
.. //depot/projects/power/sys/dev/ic/nec765.h#2 integrate
.. //depot/projects/power/sys/dev/ic/ns16550.h#3 integrate
.. //depot/projects/power/sys/dev/md/md.c#8 integrate
.. //depot/projects/power/sys/dev/nmdm/nmdm.c#5 integrate
.. //depot/projects/power/sys/dev/ofw/openfirmio.c#4 integrate
.. //depot/projects/power/sys/dev/ofw/openfirmio.h#2 integrate
.. //depot/projects/power/sys/dev/pci/pcivar.h#6 integrate
.. //depot/projects/power/sys/dev/sio/sio.c#8 integrate
.. //depot/projects/power/sys/dev/sio/sioreg.h#3 integrate
.. //depot/projects/power/sys/dev/sio/siovar.h#2 integrate
.. //depot/projects/power/sys/dev/zs/z8530reg.h#2 integrate
.. //depot/projects/power/sys/dev/zs/zs.c#5 integrate
.. //depot/projects/power/sys/fs/deadfs/dead_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/fdescfs/fdesc.h#2 integrate
.. //depot/projects/power/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate
.. //depot/projects/power/sys/fs/fdescfs/fdesc_vnops.c#4 integrate
.. //depot/projects/power/sys/fs/fifofs/fifo.h#2 integrate
.. //depot/projects/power/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/power/sys/fs/hpfs/hpfs_hash.c#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs_ihash.c#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs_vnops.c#3 integrate
.. //depot/projects/power/sys/fs/nullfs/null.h#2 integrate
.. //depot/projects/power/sys/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/power/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/power/sys/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/power/sys/fs/portalfs/portal.h#2 integrate
.. //depot/projects/power/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/power/sys/fs/portalfs/portal_vnops.c#4 integrate
.. //depot/projects/power/sys/fs/procfs/procfs.h#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_ctl.c#3 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_dbregs.c#3 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_fpregs.c#3 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_map.c#4 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_mem.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_note.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_regs.c#3 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_status.c#4 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_type.c#3 integrate
.. //depot/projects/power/sys/fs/specfs/spec_vnops.c#5 integrate
.. //depot/projects/power/sys/fs/umapfs/umap.h#2 integrate
.. //depot/projects/power/sys/fs/umapfs/umap_subr.c#2 integrate
.. //depot/projects/power/sys/fs/umapfs/umap_vfsops.c#2 integrate
.. //depot/projects/power/sys/fs/umapfs/umap_vnops.c#3 integrate
.. //depot/projects/power/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/power/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/power/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/power/sys/fs/unionfs/union_vnops.c#5 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_alloc.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_balloc.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_bmap.c#3 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_extern.h#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_ihash.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_inode.c#4 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_lookup.c#3 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_mount.h#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_readwrite.c#3 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_subr.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/power/sys/gnu/ext2fs/fs.h#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/inode.h#2 integrate
.. //depot/projects/power/sys/i386/acpica/acpi_toshiba.c#3 integrate
.. //depot/projects/power/sys/i386/i386/apic_vector.s#4 integrate
.. //depot/projects/power/sys/i386/i386/autoconf.c#3 integrate
.. //depot/projects/power/sys/i386/i386/exception.s#3 integrate
.. //depot/projects/power/sys/i386/i386/genassym.c#4 integrate
.. //depot/projects/power/sys/i386/i386/in_cksum.c#3 integrate
.. //depot/projects/power/sys/i386/i386/locore.s#4 integrate
.. //depot/projects/power/sys/i386/i386/mem.c#3 integrate
.. //depot/projects/power/sys/i386/i386/support.s#4 integrate
.. //depot/projects/power/sys/i386/i386/swtch.s#4 integrate
.. //depot/projects/power/sys/i386/i386/sys_machdep.c#2 integrate
.. //depot/projects/power/sys/i386/i386/uio_machdep.c#3 integrate
.. //depot/projects/power/sys/i386/include/_limits.h#2 integrate
.. //depot/projects/power/sys/i386/include/asm.h#2 integrate
.. //depot/projects/power/sys/i386/include/asmacros.h#3 integrate
.. //depot/projects/power/sys/i386/include/cpu.h#3 integrate
.. //depot/projects/power/sys/i386/include/cpufunc.h#4 integrate
.. //depot/projects/power/sys/i386/include/endian.h#4 integrate
.. //depot/projects/power/sys/i386/include/exec.h#2 integrate
.. //depot/projects/power/sys/i386/include/float.h#2 integrate
.. //depot/projects/power/sys/i386/include/frame.h#2 integrate
.. //depot/projects/power/sys/i386/include/in_cksum.h#3 integrate
.. //depot/projects/power/sys/i386/include/limits.h#2 integrate
.. //depot/projects/power/sys/i386/include/npx.h#2 integrate
.. //depot/projects/power/sys/i386/include/param.h#2 integrate
.. //depot/projects/power/sys/i386/include/pcb.h#3 integrate
.. //depot/projects/power/sys/i386/include/pmap.h#6 integrate
.. //depot/projects/power/sys/i386/include/proc.h#3 integrate
.. //depot/projects/power/sys/i386/include/profile.h#4 integrate
.. //depot/projects/power/sys/i386/include/psl.h#2 integrate
.. //depot/projects/power/sys/i386/include/ptrace.h#2 integrate
.. //depot/projects/power/sys/i386/include/reg.h#2 integrate
.. //depot/projects/power/sys/i386/include/reloc.h#2 integrate
.. //depot/projects/power/sys/i386/include/segments.h#3 integrate
.. //depot/projects/power/sys/i386/include/signal.h#2 integrate
.. //depot/projects/power/sys/i386/include/specialreg.h#3 integrate
.. //depot/projects/power/sys/i386/include/sysarch.h#3 integrate
.. //depot/projects/power/sys/i386/include/trap.h#2 integrate
.. //depot/projects/power/sys/i386/include/tss.h#2 integrate
.. //depot/projects/power/sys/i386/include/varargs.h#2 integrate
.. //depot/projects/power/sys/i386/include/vmparam.h#3 integrate
.. //depot/projects/power/sys/i386/isa/atpic_vector.s#3 integrate
.. //depot/projects/power/sys/i386/isa/clock.c#4 integrate
.. //depot/projects/power/sys/i386/isa/icu.h#4 integrate
.. //depot/projects/power/sys/i386/isa/isa.h#2 integrate
.. //depot/projects/power/sys/i386/isa/isa_dma.c#2 integrate
.. //depot/projects/power/sys/i386/isa/isa_dma.h#2 integrate
.. //depot/projects/power/sys/i386/isa/nmi.c#2 integrate
.. //depot/projects/power/sys/i386/isa/npx.c#4 integrate
.. //depot/projects/power/sys/i386/isa/timerreg.h#2 integrate
.. //depot/projects/power/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/genassym.c#3 integrate
.. //depot/projects/power/sys/ia64/ia64/mem.c#3 integrate
.. //depot/projects/power/sys/ia64/ia64/uio_machdep.c#2 integrate
.. //depot/projects/power/sys/ia64/include/_limits.h#2 integrate
.. //depot/projects/power/sys/ia64/include/cpu.h#3 integrate
.. //depot/projects/power/sys/ia64/include/endian.h#2 integrate
.. //depot/projects/power/sys/ia64/include/float.h#2 integrate
.. //depot/projects/power/sys/ia64/include/ieee.h#2 integrate
.. //depot/projects/power/sys/ia64/include/in_cksum.h#2 integrate
.. //depot/projects/power/sys/ia64/include/limits.h#2 integrate
.. //depot/projects/power/sys/ia64/include/param.h#2 integrate
.. //depot/projects/power/sys/ia64/include/pmap.h#5 integrate
.. //depot/projects/power/sys/ia64/include/ptrace.h#2 integrate
.. //depot/projects/power/sys/ia64/include/vmparam.h#3 integrate
.. //depot/projects/power/sys/ia64/isa/isa_dma.c#2 integrate
.. //depot/projects/power/sys/isa/fd.c#5 integrate
.. //depot/projects/power/sys/isa/fdreg.h#2 integrate
.. //depot/projects/power/sys/isa/isareg.h#2 integrate
.. //depot/projects/power/sys/isa/rtc.h#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_bmap.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_lookup.c#3 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_mount.h#3 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_node.h#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_rrip.c#3 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_rrip.h#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_util.c#3 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/power/sys/isofs/cd9660/iso.h#3 integrate
.. //depot/projects/power/sys/isofs/cd9660/iso_rrip.h#2 integrate
.. //depot/projects/power/sys/kern/imgact_elf.c#6 integrate
.. //depot/projects/power/sys/kern/kern_event.c#6 integrate
.. //depot/projects/power/sys/kern/kern_timeout.c#6 integrate
.. //depot/projects/power/sys/kern/tty.c#5 integrate
.. //depot/projects/power/sys/kern/uipc_syscalls.c#9 integrate
.. //depot/projects/power/sys/libkern/ashldi3.c#2 integrate
.. //depot/projects/power/sys/libkern/ashrdi3.c#2 integrate
.. //depot/projects/power/sys/libkern/bcmp.c#3 integrate
.. //depot/projects/power/sys/libkern/bsearch.c#2 integrate
.. //depot/projects/power/sys/libkern/divdi3.c#2 integrate
.. //depot/projects/power/sys/libkern/ffs.c#3 integrate
.. //depot/projects/power/sys/libkern/ffsl.c#2 integrate
.. //depot/projects/power/sys/libkern/fls.c#2 integrate
.. //depot/projects/power/sys/libkern/flsl.c#2 integrate
.. //depot/projects/power/sys/libkern/fnmatch.c#2 integrate
.. //depot/projects/power/sys/libkern/index.c#3 integrate
.. //depot/projects/power/sys/libkern/lshrdi3.c#2 integrate
.. //depot/projects/power/sys/libkern/mcount.c#2 integrate
.. //depot/projects/power/sys/libkern/moddi3.c#2 integrate
.. //depot/projects/power/sys/libkern/qdivrem.c#2 integrate
.. //depot/projects/power/sys/libkern/qsort.c#2 integrate
.. //depot/projects/power/sys/libkern/quad.h#3 integrate
.. //depot/projects/power/sys/libkern/random.c#2 integrate
.. //depot/projects/power/sys/libkern/rindex.c#3 integrate
.. //depot/projects/power/sys/libkern/scanc.c#2 integrate
.. //depot/projects/power/sys/libkern/skpc.c#2 integrate
.. //depot/projects/power/sys/libkern/strcat.c#2 integrate
.. //depot/projects/power/sys/libkern/strcmp.c#2 integrate
.. //depot/projects/power/sys/libkern/strcpy.c#2 integrate
.. //depot/projects/power/sys/libkern/strlen.c#2 integrate
.. //depot/projects/power/sys/libkern/strncmp.c#2 integrate
.. //depot/projects/power/sys/libkern/strncpy.c#2 integrate
.. //depot/projects/power/sys/libkern/strsep.c#2 integrate
.. //depot/projects/power/sys/libkern/strtol.c#2 integrate
.. //depot/projects/power/sys/libkern/strtoq.c#2 integrate
.. //depot/projects/power/sys/libkern/strtoul.c#2 integrate
.. //depot/projects/power/sys/libkern/strtouq.c#2 integrate
.. //depot/projects/power/sys/libkern/ucmpdi2.c#2 integrate
.. //depot/projects/power/sys/libkern/udivdi3.c#2 integrate
.. //depot/projects/power/sys/libkern/umoddi3.c#2 integrate
.. //depot/projects/power/sys/net/bpf.c#6 integrate
.. //depot/projects/power/sys/net/bpf.h#7 integrate
.. //depot/projects/power/sys/net/bpf_compat.h#2 integrate
.. //depot/projects/power/sys/net/bpf_filter.c#2 integrate
.. //depot/projects/power/sys/net/bpfdesc.h#4 integrate
.. //depot/projects/power/sys/net/bsd_comp.c#2 integrate
.. //depot/projects/power/sys/net/if.c#7 integrate
.. //depot/projects/power/sys/net/if.h#4 integrate
.. //depot/projects/power/sys/net/if_arc.h#2 integrate
.. //depot/projects/power/sys/net/if_arp.h#2 integrate
.. //depot/projects/power/sys/net/if_disc.c#6 integrate
.. //depot/projects/power/sys/net/if_dl.h#2 integrate
.. //depot/projects/power/sys/net/if_ethersubr.c#7 integrate
.. //depot/projects/power/sys/net/if_faith.c#6 integrate
.. //depot/projects/power/sys/net/if_llc.h#2 integrate
.. //depot/projects/power/sys/net/if_loop.c#7 integrate
.. //depot/projects/power/sys/net/if_sl.c#5 integrate
.. //depot/projects/power/sys/net/if_slvar.h#2 integrate
.. //depot/projects/power/sys/net/if_types.h#4 integrate
.. //depot/projects/power/sys/net/if_var.h#8 integrate
.. //depot/projects/power/sys/net/netisr.h#3 integrate
.. //depot/projects/power/sys/net/radix.c#3 integrate
.. //depot/projects/power/sys/net/radix.h#2 integrate
.. //depot/projects/power/sys/net/raw_cb.c#2 integrate
.. //depot/projects/power/sys/net/raw_cb.h#2 integrate
.. //depot/projects/power/sys/net/raw_usrreq.c#4 integrate
.. //depot/projects/power/sys/net/route.c#7 integrate
.. //depot/projects/power/sys/net/route.h#5 integrate
.. //depot/projects/power/sys/net/rtsock.c#4 integrate
.. //depot/projects/power/sys/net/slcompress.c#2 integrate
.. //depot/projects/power/sys/net/slcompress.h#2 integrate
.. //depot/projects/power/sys/net/slip.h#2 integrate
.. //depot/projects/power/sys/netatalk/aarp.c#5 integrate
.. //depot/projects/power/sys/netinet/icmp6.h#4 integrate
.. //depot/projects/power/sys/netinet/icmp_var.h#3 integrate
.. //depot/projects/power/sys/netinet/if_ether.c#7 integrate
.. //depot/projects/power/sys/netinet/if_ether.h#3 integrate
.. //depot/projects/power/sys/netinet/igmp.c#2 integrate
.. //depot/projects/power/sys/netinet/igmp.h#2 integrate
.. //depot/projects/power/sys/netinet/igmp_var.h#2 integrate
.. //depot/projects/power/sys/netinet/in.c#5 integrate
.. //depot/projects/power/sys/netinet/in.h#3 integrate
.. //depot/projects/power/sys/netinet/in_cksum.c#2 integrate
.. //depot/projects/power/sys/netinet/in_pcb.c#7 integrate
.. //depot/projects/power/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/power/sys/netinet/in_proto.c#5 integrate
.. //depot/projects/power/sys/netinet/in_systm.h#2 integrate
.. //depot/projects/power/sys/netinet/in_var.h#4 integrate
.. //depot/projects/power/sys/netinet/ip.h#4 integrate
.. //depot/projects/power/sys/netinet/ip6.h#5 integrate
.. //depot/projects/power/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/power/sys/netinet/ip_icmp.c#8 integrate
.. //depot/projects/power/sys/netinet/ip_icmp.h#3 integrate
.. //depot/projects/power/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/power/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/power/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/power/sys/netinet/ip_var.h#5 integrate
.. //depot/projects/power/sys/netinet/ipprotosw.h#2 integrate
.. //depot/projects/power/sys/netinet/raw_ip.c#6 integrate
.. //depot/projects/power/sys/netinet/tcp.h#4 integrate
.. //depot/projects/power/sys/netinet/tcp_debug.c#3 integrate
.. //depot/projects/power/sys/netinet/tcp_debug.h#2 integrate
.. //depot/projects/power/sys/netinet/tcp_fsm.h#2 integrate
.. //depot/projects/power/sys/netinet/tcp_input.c#9 integrate
.. //depot/projects/power/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/power/sys/netinet/tcp_seq.h#2 integrate
.. //depot/projects/power/sys/netinet/tcp_subr.c#11 integrate
.. //depot/projects/power/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/power/sys/netinet/tcp_timer.h#2 integrate
.. //depot/projects/power/sys/netinet/tcp_usrreq.c#8 integrate
.. //depot/projects/power/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/power/sys/netinet/tcpip.h#2 integrate
.. //depot/projects/power/sys/netinet/udp.h#2 integrate
.. //depot/projects/power/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/power/sys/netinet/udp_var.h#2 integrate
.. //depot/projects/power/sys/netinet6/icmp6.c#6 integrate
.. //depot/projects/power/sys/netinet6/in6.c#6 integrate
.. //depot/projects/power/sys/netinet6/in6.h#5 integrate
.. //depot/projects/power/sys/netinet6/in6_cksum.c#3 integrate
.. //depot/projects/power/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/power/sys/netinet6/in6_pcb.h#4 integrate
.. //depot/projects/power/sys/netinet6/in6_prefix.c#3 integrate
.. //depot/projects/power/sys/netinet6/in6_proto.c#4 integrate
.. //depot/projects/power/sys/netinet6/in6_src.c#7 integrate
.. //depot/projects/power/sys/netinet6/in6_var.h#5 integrate
.. //depot/projects/power/sys/netinet6/ip6_input.c#6 integrate
.. //depot/projects/power/sys/netinet6/ip6_mroute.c#5 integrate
.. //depot/projects/power/sys/netinet6/ip6_output.c#8 integrate
.. //depot/projects/power/sys/netinet6/ip6_var.h#5 integrate
.. //depot/projects/power/sys/netinet6/ip6protosw.h#3 integrate
.. //depot/projects/power/sys/netinet6/mld6.c#6 integrate
.. //depot/projects/power/sys/netinet6/raw_ip6.c#8 integrate
.. //depot/projects/power/sys/netinet6/tcp6_var.h#2 integrate
.. //depot/projects/power/sys/netinet6/udp6_output.c#6 integrate
.. //depot/projects/power/sys/netinet6/udp6_usrreq.c#8 integrate
.. //depot/projects/power/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/power/sys/nfs4client/nfs4_socket.c#3 integrate
.. //depot/projects/power/sys/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/power/sys/nfs4client/nfs4_vnops.c#3 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vnops.c#5 integrate
.. //depot/projects/power/sys/vm/vm_init.c#4 integrate
.. //depot/projects/power/sys/vm/vm_pager.c#5 integrate
.. //depot/projects/power/sys/vm/vm_pager.h#5 integrate
Differences ...
==== //depot/projects/power/sys/alpha/alpha/timerreg.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: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- * $FreeBSD: src/sys/alpha/alpha/timerreg.h,v 1.2 1999/08/28 00:38:32 peter Exp $
+ * $FreeBSD: src/sys/alpha/alpha/timerreg.h,v 1.3 2004/04/07 20:45:55 imp Exp $
*/
/*
==== //depot/projects/power/sys/boot/arc/lib/elf_freebsd.c#3 (text+ko) ====
@@ -51,10 +51,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.
@@ -75,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.5 2004/01/04 23:28:01 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.6 2004/04/07 20:45:55 imp Exp $");
#include <stand.h>
#include <string.h>
==== //depot/projects/power/sys/boot/common/newvers.sh#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.3 2001/03/02 16:52:12 ru Exp $
+# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $
# $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -14,10 +14,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.
==== //depot/projects/power/sys/compat/ndis/kern_ndis.c#7 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.49 2004/04/05 08:26:52 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.50 2004/04/07 17:02:55 wpaul Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -777,6 +777,8 @@
block = &sc->ndis_block;
dev = sc->ndis_dev;
+ SLIST_INIT(&brl_rev);
+
rl = malloc(sizeof(ndis_resource_list) +
(sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)),
M_DEVBUF, M_NOWAIT|M_ZERO);
@@ -805,7 +807,6 @@
* in order to fix this, we have to create our own
* temporary list with the entries in reverse order.
*/
- SLIST_INIT(&brl_rev);
SLIST_FOREACH(brle, brl, link) {
n = malloc(sizeof(struct resource_list_entry),
M_TEMP, M_NOWAIT);
==== //depot/projects/power/sys/conf/files#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.881 2004/04/03 18:42:05 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.882 2004/04/08 18:17:13 mlaier Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -208,7 +208,7 @@
contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet
contrib/pf/net/if_pflog.c optional pflog
contrib/pf/net/if_pfsync.c optional pfsync
-contrib/pf/net/pf.c optional pf nowerror
+contrib/pf/net/pf.c optional pf
contrib/pf/net/pf_ioctl.c optional pf
contrib/pf/net/pf_norm.c optional pf
contrib/pf/net/pf_table.c optional pf
==== //depot/projects/power/sys/conf/newvers.sh#5 (text+ko) ====
@@ -11,10 +11,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.
@@ -32,7 +28,7 @@
# SUCH DAMAGE.
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.60 2004/01/11 14:13:29 ru Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.61 2004/04/07 20:45:56 imp Exp $
TYPE="FreeBSD"
REVISION="5.2"
==== //depot/projects/power/sys/conf/systags.sh#3 (text+ko) ====
@@ -11,10 +11,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.
@@ -32,7 +28,7 @@
# SUCH DAMAGE.
#
# @(#)systags.sh 8.1 (Berkeley) 6/10/93
-# $FreeBSD: src/sys/conf/systags.sh,v 1.8 2004/01/29 14:58:22 kensmith Exp $
+# $FreeBSD: src/sys/conf/systags.sh,v 1.9 2004/04/07 20:45:56 imp Exp $
#
# systags.sh - construct a system tags file using dependence relations
# in a .depend file
==== //depot/projects/power/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ====
@@ -99,7 +99,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.36 2003/02/19 05:47:00 imp Exp $";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.37 2004/04/07 20:45:56 imp Exp $";
#endif
#ifndef _KERNEL
@@ -1526,10 +1526,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.
==== //depot/projects/power/sys/ddb/db_ps.c#3 (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.
@@ -32,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.50 2004/02/27 18:52:42 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.51 2004/04/07 20:45:56 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/power/sys/dev/acpica/acpi.c#16 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.134 2004/04/01 04:21:33 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.135 2004/04/08 16:45:12 njl Exp $
*/
#include "opt_acpi.h"
@@ -187,7 +187,7 @@
static devclass_t acpi_devclass;
DRIVER_MODULE(acpi, nexus, acpi_driver, acpi_devclass, acpi_modevent, 0);
-MODULE_VERSION(acpi, 100);
+MODULE_VERSION(acpi, 1);
SYSCTL_NODE(_debug, OID_AUTO, acpi, CTLFLAG_RW, NULL, "ACPI debugging");
static char acpi_ca_version[12];
==== //depot/projects/power/sys/dev/acpica/acpi_pci.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.9 2004/03/31 17:35:28 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.10 2004/04/07 19:42:21 jhb Exp $");
#include "opt_bus.h"
==== //depot/projects/power/sys/dev/acpica/acpi_video.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*
* $Id: acpi_vid.c,v 1.4 2003/10/13 10:07:36 taku Exp $
- * $FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.2 2004/03/03 18:34:42 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.3 2004/04/08 16:45:12 njl Exp $
*/
#include <sys/param.h>
@@ -154,7 +154,7 @@
DRIVER_MODULE(acpi_video, acpi, acpi_video_driver, acpi_video_devclass,
acpi_video_modevent, NULL);
-MODULE_DEPEND(acpi_video, acpi, 100, 100, 100);
+MODULE_DEPEND(acpi_video, acpi, 1, 1, 1);
struct sysctl_ctx_list acpi_video_sysctl_ctx;
struct sysctl_oid *acpi_video_sysctl_tree;
==== //depot/projects/power/sys/dev/fb/gallant12x22.h#2 (text+ko) ====
@@ -17,10 +17,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.
@@ -39,7 +35,7 @@
*
* Derived from: @(#)gallant19.h 8.1 (Berkeley) 6/11/93
*
- * $FreeBSD: src/sys/dev/fb/gallant12x22.h,v 1.1 2003/08/24 01:15:39 jake Exp $
+ * $FreeBSD: src/sys/dev/fb/gallant12x22.h,v 1.2 2004/04/07 20:45:57 imp Exp $
*/
static u_char gallant12x22_data[] = {
==== //depot/projects/power/sys/dev/fxp/if_fxp.c#7 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.201 2004/03/17 17:50:33 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.202 2004/04/07 15:47:14 imp Exp $");
/*
* Intel EtherExpress Pro/100B PCI Fast Ethernet driver
@@ -168,6 +168,7 @@
{ 0x103D, -1, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" },
{ 0x103E, -1, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" },
{ 0x1050, -1, "Intel 82801BA (D865) Pro/100 VE Ethernet" },
+ { 0x1051, -1, "Intel 82562ET (ICH5/ICH5R) Pro/100 VE Ethernet" },
{ 0x1059, -1, "Intel 82551QM Pro/100 M Mobile Connection" },
{ 0x1209, -1, "Intel 82559ER Embedded 10/100 Ethernet" },
{ 0x1229, 0x01, "Intel 82557 Pro/100 Ethernet" },
==== //depot/projects/power/sys/dev/ic/i8251.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.
@@ -30,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ic/i8251.h,v 1.1 2001/06/10 04:28:38 nyan Exp $
+ * $FreeBSD: src/sys/dev/ic/i8251.h,v 1.2 2004/04/07 20:45:57 imp Exp $
*/
/*
==== //depot/projects/power/sys/dev/ic/nec765.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: @(#)nec765.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/dev/ic/nec765.h,v 1.10 2001/12/16 07:52:13 joerg Exp $
+ * $FreeBSD: src/sys/dev/ic/nec765.h,v 1.11 2004/04/07 20:45:57 imp Exp $
*/
/*
==== //depot/projects/power/sys/dev/ic/ns16550.h#3 (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: @(#)ns16550.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.14 2003/09/16 14:21:17 bde Exp $
+ * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.15 2004/04/07 20:45:57 imp Exp $
*/
/*
==== //depot/projects/power/sys/dev/md/md.c#8 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/dev/md/md.c,v 1.120 2004/04/03 09:16:25 alc Exp $
+ * $FreeBSD: src/sys/dev/md/md.c,v 1.121 2004/04/07 20:45:57 imp Exp $
*
*/
@@ -19,10 +19,6 @@
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -31,10 +27,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.
==== //depot/projects/power/sys/dev/nmdm/nmdm.c#5 (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.
@@ -33,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.21 2004/03/11 12:58:54 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.22 2004/04/07 20:45:57 imp Exp $");
/*
* Pseudo-nulmodem driver
==== //depot/projects/power/sys/dev/ofw/openfirmio.c#4 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: openfirmio.c,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirmio.c,v 1.8 2004/02/21 21:10:45 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirmio.c,v 1.9 2004/04/07 20:45:57 imp Exp $");
/*
* Copyright (c) 1992, 1993
@@ -24,10 +24,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.
==== //depot/projects/power/sys/dev/ofw/openfirmio.h#2 (text+ko) ====
@@ -8,11 +8,6 @@
* at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
* contributed to Berkeley.
*
- * 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, Lawrence Berkeley Laboratory.
- *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -21,10 +16,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.
@@ -43,7 +34,7 @@
*
* @(#)openpromio.h 8.1 (Berkeley) 6/11/93
*
- * $FreeBSD: src/sys/dev/ofw/openfirmio.h,v 1.2 2003/06/11 18:33:03 tmm Exp $
+ * $FreeBSD: src/sys/dev/ofw/openfirmio.h,v 1.3 2004/04/07 20:45:57 imp Exp $
*/
#ifndef _DEV_OFW_OPENFIRMIO_H_
==== //depot/projects/power/sys/dev/pci/pcivar.h#6 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.63 2003/09/14 19:30:00 scottl Exp $
+ * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.64 2004/04/07 20:45:58 imp Exp $
*
*/
==== //depot/projects/power/sys/dev/sio/sio.c#8 (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.
@@ -35,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.425 2004/04/07 05:30:54 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.427 2004/04/07 21:56:20 imp Exp $");
#include "opt_comconsole.h"
#include "opt_compat.h"
==== //depot/projects/power/sys/dev/sio/sioreg.h#3 (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: @(#)comreg.h 7.2 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/dev/sio/sioreg.h,v 1.23 2003/09/16 08:08:08 bde Exp $
+ * $FreeBSD: src/sys/dev/sio/sioreg.h,v 1.24 2004/04/07 20:45:58 imp Exp $
*/
/* Receiver clock frequency for "standard" pc serial ports. */
==== //depot/projects/power/sys/dev/sio/siovar.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.
@@ -30,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sio/siovar.h,v 1.5 2002/03/20 02:07:41 alfred Exp $
+ * $FreeBSD: src/sys/dev/sio/siovar.h,v 1.6 2004/04/07 20:45:58 imp Exp $
*/
#ifdef PC98
==== //depot/projects/power/sys/dev/zs/z8530reg.h#2 (text+ko) ====
@@ -21,10 +21,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.
@@ -43,7 +39,7 @@
*
* @(#)zsreg.h 8.1 (Berkeley) 6/11/93
*
- * $FreeBSD: src/sys/dev/zs/z8530reg.h,v 1.2 2003/01/08 23:36:16 jake Exp $
+ * $FreeBSD: src/sys/dev/zs/z8530reg.h,v 1.3 2004/04/07 20:45:58 imp Exp $
*/
/*
==== //depot/projects/power/sys/dev/zs/zs.c#5 (text+ko) ====
@@ -20,10 +20,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.
@@ -44,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.18 2004/02/21 21:10:49 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.19 2004/04/07 20:45:58 imp Exp $");
/*-
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
==== //depot/projects/power/sys/fs/deadfs/dead_vnops.c#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.
*
* @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/fs/deadfs/dead_vnops.c,v 1.39 2003/03/03 19:15:37 njl Exp $
+ * $FreeBSD: src/sys/fs/deadfs/dead_vnops.c,v 1.40 2004/04/07 20:45:59 imp Exp $
*/
#include <sys/param.h>
==== //depot/projects/power/sys/fs/fdescfs/fdesc.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.
@@ -35,7 +31,7 @@
*
* @(#)fdesc.h 8.5 (Berkeley) 1/21/94
*
- * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.16 2002/03/19 22:19:59 alfred Exp $
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.17 2004/04/07 20:45:59 imp Exp $
*/
#ifdef _KERNEL
==== //depot/projects/power/sys/fs/fdescfs/fdesc_vfsops.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.
@@ -35,7 +31,7 @@
*
* @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94
*
- * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.42 2004/02/04 21:52:53 jhb Exp $
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.43 2004/04/07 20:45:59 imp Exp $
*/
/*
==== //depot/projects/power/sys/fs/fdescfs/fdesc_vnops.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.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list