From owner-p4-projects@FreeBSD.ORG Tue Apr 6 13:02:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 733D616A4CE; Tue, 6 Apr 2004 13:02:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEF0716A4D0 for ; Tue, 6 Apr 2004 13:02:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D14A843D5D for ; Tue, 6 Apr 2004 13:02:55 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i36Jp8Ge049594 for ; Tue, 6 Apr 2004 12:51:08 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i36Jp4Zp049591 for perforce@freebsd.org; Tue, 6 Apr 2004 12:51:04 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 6 Apr 2004 12:51:04 -0700 (PDT) Message-Id: <200404061951.i36Jp4Zp049591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 50503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2004 20:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=50503 Change 50503 by imp@imp_pacopaco on 2004/04/06 12:50:55 IFC @50483 Affected files ... .. //depot/projects/power/sys/alpha/alpha/clock.c#3 integrate .. //depot/projects/power/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/power/sys/alpha/alpha/mem.c#3 integrate .. //depot/projects/power/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/power/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/power/sys/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/power/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/power/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/power/sys/alpha/include/endian.h#2 integrate .. //depot/projects/power/sys/alpha/include/float.h#2 integrate .. //depot/projects/power/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/power/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/power/sys/alpha/include/limits.h#2 integrate .. //depot/projects/power/sys/alpha/include/param.h#2 integrate .. //depot/projects/power/sys/alpha/include/pmap.h#4 integrate .. //depot/projects/power/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/power/sys/alpha/include/sysarch.h#3 integrate .. //depot/projects/power/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/power/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/power/sys/amd64/amd64/autoconf.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/power/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/power/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/power/sys/amd64/amd64/mem.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/power/sys/amd64/amd64/support.S#7 integrate .. //depot/projects/power/sys/amd64/amd64/sys_machdep.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/power/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/power/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/power/sys/amd64/include/asm.h#2 integrate .. //depot/projects/power/sys/amd64/include/asmacros.h#4 integrate .. //depot/projects/power/sys/amd64/include/cpu.h#3 integrate .. //depot/projects/power/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/power/sys/amd64/include/endian.h#3 integrate .. //depot/projects/power/sys/amd64/include/exec.h#2 integrate .. //depot/projects/power/sys/amd64/include/float.h#2 integrate .. //depot/projects/power/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/power/sys/amd64/include/frame.h#4 integrate .. //depot/projects/power/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/power/sys/amd64/include/limits.h#3 integrate .. //depot/projects/power/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/power/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/power/sys/amd64/include/proc.h#3 integrate .. //depot/projects/power/sys/amd64/include/profile.h#3 integrate .. //depot/projects/power/sys/amd64/include/psl.h#2 integrate .. //depot/projects/power/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/power/sys/amd64/include/reg.h#4 integrate .. //depot/projects/power/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/power/sys/amd64/include/segments.h#4 integrate .. //depot/projects/power/sys/amd64/include/signal.h#4 integrate .. //depot/projects/power/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/power/sys/amd64/include/sysarch.h#4 integrate .. //depot/projects/power/sys/amd64/include/trap.h#2 integrate .. //depot/projects/power/sys/amd64/include/tss.h#3 integrate .. //depot/projects/power/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/power/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/power/sys/amd64/isa/icu.h#4 integrate .. //depot/projects/power/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/power/sys/amd64/isa/isa_dma.c#4 integrate .. //depot/projects/power/sys/amd64/isa/isa_dma.h#2 integrate .. //depot/projects/power/sys/amd64/isa/nmi.c#2 integrate .. //depot/projects/power/sys/amd64/isa/timerreg.h#2 integrate .. //depot/projects/power/sys/arm/include/_limits.h#2 integrate .. //depot/projects/power/sys/arm/include/limits.h#2 integrate .. //depot/projects/power/sys/arm/include/signal.h#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/elf_freebsd.c#3 integrate .. //depot/projects/power/sys/boot/efi/libefi/elf_freebsd.c#3 integrate .. //depot/projects/power/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/power/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/power/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/power/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/power/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/power/sys/boot/sparc64/loader/metadata.c#4 integrate .. //depot/projects/power/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/power/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/power/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/power/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/power/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/power/sys/compat/ndis/ndis_var.h#6 integrate .. //depot/projects/power/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/power/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/power/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/power/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/power/sys/dev/fb/creator.c#4 integrate .. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/power/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/power/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/power/sys/dev/uart/uart_cpu_sparc64.c#6 integrate .. //depot/projects/power/sys/geom/geom_io.c#5 integrate .. //depot/projects/power/sys/i386/conf/NOTES#10 integrate .. //depot/projects/power/sys/i386/i386/db_interface.c#4 integrate .. //depot/projects/power/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/power/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/power/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/power/sys/i386/include/pmap.h#5 integrate .. //depot/projects/power/sys/i386/isa/cy.c#6 integrate .. //depot/projects/power/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/power/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/power/sys/isa/psm.c#5 integrate .. //depot/projects/power/sys/kern/init_sysent.c#6 integrate .. //depot/projects/power/sys/kern/kern_clock.c#5 integrate .. //depot/projects/power/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/power/sys/kern/kern_exit.c#4 integrate .. //depot/projects/power/sys/kern/kern_fork.c#7 integrate .. //depot/projects/power/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/power/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/power/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/power/sys/kern/kern_mib.c#3 integrate .. //depot/projects/power/sys/kern/kern_proc.c#5 integrate .. //depot/projects/power/sys/kern/kern_prot.c#7 integrate .. //depot/projects/power/sys/kern/kern_resource.c#4 integrate .. //depot/projects/power/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/power/sys/kern/kern_sig.c#10 integrate .. //depot/projects/power/sys/kern/kern_subr.c#5 integrate .. //depot/projects/power/sys/kern/kern_synch.c#5 integrate .. //depot/projects/power/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/power/sys/kern/kern_time.c#3 integrate .. //depot/projects/power/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/power/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/power/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/power/sys/kern/sched_ule.c#7 integrate .. //depot/projects/power/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/power/sys/kern/subr_clock.c#2 integrate .. //depot/projects/power/sys/kern/subr_log.c#4 integrate .. //depot/projects/power/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/power/sys/kern/subr_param.c#4 integrate .. //depot/projects/power/sys/kern/subr_prf.c#4 integrate .. //depot/projects/power/sys/kern/subr_prof.c#3 integrate .. //depot/projects/power/sys/kern/subr_scanf.c#2 integrate .. //depot/projects/power/sys/kern/sys_generic.c#5 integrate .. //depot/projects/power/sys/kern/sys_socket.c#3 integrate .. //depot/projects/power/sys/kern/syscalls.c#6 integrate .. //depot/projects/power/sys/kern/syscalls.master#6 integrate .. //depot/projects/power/sys/kern/tty_compat.c#2 integrate .. //depot/projects/power/sys/kern/tty_conf.c#2 integrate .. //depot/projects/power/sys/kern/tty_cons.c#4 integrate .. //depot/projects/power/sys/kern/tty_pty.c#5 integrate .. //depot/projects/power/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/power/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/power/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/power/sys/kern/uipc_proto.c#2 integrate .. //depot/projects/power/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/power/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/power/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/power/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/power/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/power/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/power/sys/kern/vfs_default.c#5 integrate .. //depot/projects/power/sys/kern/vfs_export.c#2 integrate .. //depot/projects/power/sys/kern/vfs_init.c#4 integrate .. //depot/projects/power/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/power/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/power/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/power/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/power/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/power/sys/kern/vnode_if.src#2 integrate .. //depot/projects/power/sys/modules/pf/Makefile#2 integrate .. //depot/projects/power/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/power/sys/modules/pfsync/Makefile#2 integrate .. //depot/projects/power/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/power/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/power/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/power/sys/net/if_gif.c#5 integrate .. //depot/projects/power/sys/net/if_gif.h#2 integrate .. //depot/projects/power/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/power/sys/net/if_var.h#7 integrate .. //depot/projects/power/sys/net/route.h#4 integrate .. //depot/projects/power/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/power/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/power/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/power/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/power/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/power/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/power/sys/netinet/if_ether.c#6 integrate .. //depot/projects/power/sys/netinet/if_ether.h#2 integrate .. //depot/projects/power/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/power/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/power/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/power/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/power/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/power/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/power/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/power/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/power/sys/pci/agp_ali.c#4 integrate .. //depot/projects/power/sys/pci/agp_amd.c#4 integrate .. //depot/projects/power/sys/pci/agp_i810.c#6 integrate .. //depot/projects/power/sys/pci/agp_intel.c#6 integrate .. //depot/projects/power/sys/pci/agp_nvidia.c#3 integrate .. //depot/projects/power/sys/pci/agp_sis.c#3 integrate .. //depot/projects/power/sys/pci/agp_via.c#3 integrate .. //depot/projects/power/sys/pci/agpreg.h#3 integrate .. //depot/projects/power/sys/pci/if_ste.c#10 integrate .. //depot/projects/power/sys/pci/if_stereg.h#6 integrate .. //depot/projects/power/sys/pci/if_vr.c#6 integrate .. //depot/projects/power/sys/pci/if_vrreg.h#4 integrate .. //depot/projects/power/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/power/sys/powerpc/powerpc/pmap.c#5 integrate .. //depot/projects/power/sys/sparc64/creator/creator_upa.c#4 integrate .. //depot/projects/power/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/power/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/power/sys/sys/mount.h#4 integrate .. //depot/projects/power/sys/sys/syscall.h#6 integrate .. //depot/projects/power/sys/sys/syscall.mk#6 integrate .. //depot/projects/power/sys/sys/sysproto.h#6 integrate .. //depot/projects/power/sys/ufs/ffs/fs.h#3 integrate .. //depot/projects/power/sys/vm/pmap.h#4 integrate .. //depot/projects/power/sys/vm/vm_init.c#2 integrate .. //depot/projects/power/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/power/sys/vm/vm_page.c#7 integrate .. //depot/projects/power/sys/vm/vm_page.h#5 integrate .. //depot/projects/power/sys/vm/vm_pager.c#3 integrate .. //depot/projects/power/sys/vm/vm_pager.h#3 integrate .. //depot/projects/power/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/power/sys/alpha/alpha/clock.c#3 (text+ko) ==== @@ -15,10 +15,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. @@ -42,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.35 2003/11/13 09:24:21 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.36 2004/04/05 21:00:49 imp Exp $"); #include "opt_clock.h" ==== //depot/projects/power/sys/alpha/alpha/genassym.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 -__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.43 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.44 2004/04/05 21:00:49 imp Exp $"); #include #include ==== //depot/projects/power/sys/alpha/alpha/mem.c#3 (text+ko) ==== @@ -16,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. @@ -41,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.47 2004/02/21 21:10:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.48 2004/04/05 21:00:49 imp Exp $"); /* * Memory special file ==== //depot/projects/power/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.140 2004/03/07 21:06:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.142 2004/04/05 04:07:58 alc Exp $"); #include #include @@ -301,7 +301,6 @@ */ struct pmap kernel_pmap_store; -vm_offset_t avail_start; /* PA of first available physical page */ vm_offset_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -512,7 +511,6 @@ Lev2map[i] = newpte; } - avail_start = phys_avail[0]; for (i = 0; phys_avail[i+2]; i+= 2) ; avail_end = phys_avail[i+1]; @@ -615,8 +613,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_offset_t phys_start, phys_end; +pmap_init(void) { int i; int initial_pvs; ==== //depot/projects/power/sys/alpha/alpha/sys_machdep.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. @@ -34,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.26 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.27 2004/04/05 21:00:49 imp Exp $"); #include "opt_mac.h" ==== //depot/projects/power/sys/alpha/alpha/uio_machdep.c#2 (text+ko) ==== @@ -16,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. @@ -40,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.1 2004/03/20 21:06:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.2 2004/04/05 21:00:49 imp Exp $"); #include #include ==== //depot/projects/power/sys/alpha/include/_limits.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. @@ -32,7 +28,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.14 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.15 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE__LIMITS_H_ ==== //depot/projects/power/sys/alpha/include/cpu.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.36 2003/08/17 06:42:07 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.37 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -18,10 +18,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/alpha/include/endian.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. @@ -32,7 +28,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.14 2003/08/03 07:50:18 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.15 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_ENDIAN_H_ ==== //depot/projects/power/sys/alpha/include/float.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/float.h,v 1.4 2003/02/08 20:37:54 mike Exp $ */ +/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -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. ==== //depot/projects/power/sys/alpha/include/ieee.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/ieee.h,v 1.2 1999/08/28 00:38:44 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/ieee.h,v 1.3 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */ /* @@ -9,11 +9,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: @@ -22,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. ==== //depot/projects/power/sys/alpha/include/in_cksum.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. @@ -33,7 +29,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.5 2000/05/06 18:18:31 jlemon Exp $ + * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.6 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ ==== //depot/projects/power/sys/alpha/include/limits.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. @@ -32,7 +28,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.12 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.13 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_LIMITS_H_ ==== //depot/projects/power/sys/alpha/include/param.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.32 2003/07/31 01:31:31 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.33 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -18,10 +18,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/alpha/include/pmap.h#4 (text+ko) ==== @@ -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. @@ -43,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.25 2004/03/07 07:13:15 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.28 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -208,10 +204,7 @@ #ifdef _KERNEL -extern caddr_t CADDR1; -extern pt_entry_t *CMAP1; extern vm_offset_t avail_end; -extern vm_offset_t avail_start; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/power/sys/alpha/include/ptrace.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. * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.10 2002/03/16 00:25:50 des Exp $ + * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.11 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_PTRACE_H_ ==== //depot/projects/power/sys/alpha/include/sysarch.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. @@ -30,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.7 2004/01/09 16:52:08 nectar Exp $ + * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.8 2004/04/05 21:00:50 imp Exp $ */ /* ==== //depot/projects/power/sys/alpha/include/vmparam.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.8 2002/11/01 03:34:51 jeff Exp $ */ +/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.9 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */ #ifndef _ALPHA_VMPARAM_H #define _ALPHA_VMPARAM_H @@ -19,10 +19,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/alpha/isa/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. @@ -48,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.10 2003/08/22 07:20:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.11 2004/04/05 21:00:51 imp Exp $"); #include #include ==== //depot/projects/power/sys/amd64/amd64/apic_vector.S#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. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.96 2003/12/06 23:19:47 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.97 2004/04/05 21:25:51 imp Exp $ */ /* ==== //depot/projects/power/sys/amd64/amd64/autoconf.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 -__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.177 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.178 2004/04/05 21:25:51 imp Exp $"); /* * Setup the system to run on the current machine. ==== //depot/projects/power/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -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. @@ -34,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.147 2004/02/06 20:38:39 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.148 2004/04/05 23:55:13 imp Exp $ */ #include ==== //depot/projects/power/sys/amd64/amd64/exception.S#4 (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. @@ -31,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.115 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.116 2004/04/05 21:25:51 imp Exp $ */ #include ==== //depot/projects/power/sys/amd64/amd64/fpu.c#4 (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. @@ -35,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.148 2004/01/28 23:55:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.149 2004/04/05 21:25:51 imp Exp $"); #include #include ==== //depot/projects/power/sys/amd64/amd64/genassym.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 -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.152 2004/01/28 23:57:02 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.153 2004/04/05 21:25:51 imp Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/power/sys/amd64/amd64/mem.c#5 (text+ko) ==== @@ -16,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. @@ -41,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.113 2004/02/21 21:10:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.114 2004/04/05 21:25:51 imp Exp $"); /* * Memory special file ==== //depot/projects/power/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.454 2004/03/31 02:03:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.456 2004/04/05 00:37:47 alc Exp $"); /* * Manages physical address maps. @@ -200,8 +200,7 @@ * All those kernel PT submaps that BSD is so fond of */ pt_entry_t *CMAP1 = 0; -static pt_entry_t *ptmmap; -caddr_t CADDR1 = 0, ptvmmap = 0; +caddr_t CADDR1 = 0; static pt_entry_t *msgbufmap; struct msgbuf *msgbufp = 0; @@ -507,12 +506,6 @@ SYSMAP(caddr_t, pt_crashdumpmap, crashdumpmap, MAXDUMPPGS); /* - * ptvmmap is used for reading arbitrary physical pages via /dev/mem. - * XXX ptmmap is not used. - */ - SYSMAP(caddr_t, ptmmap, ptvmmap, 1) - - /* * msgbufp is used to map the system message buffer. * XXX msgbufmap is not used. */ @@ -534,8 +527,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_paddr_t phys_start, phys_end; +pmap_init(void) { int i; ==== //depot/projects/power/sys/amd64/amd64/support.S#7 (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. @@ -31,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.107 2004/04/03 05:33:10 alc Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.108 2004/04/05 23:55:13 imp Exp $ */ #include "opt_ddb.h" ==== //depot/projects/power/sys/amd64/amd64/sys_machdep.c#4 (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. @@ -35,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.87 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.88 2004/04/05 23:55:13 imp Exp $"); #include #include ==== //depot/projects/power/sys/amd64/amd64/uio_machdep.c#2 (text+ko) ==== @@ -16,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. @@ -40,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.2 2004/03/20 21:06:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.3 2004/04/05 21:15:52 imp Exp $"); #include #include ==== //depot/projects/power/sys/amd64/ia32/ia32_signal.c#6 (text+ko) ==== @@ -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. @@ -36,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.9 2004/02/21 23:34:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.10 2004/04/05 23:55:14 imp Exp $"); #include "opt_compat.h" ==== //depot/projects/power/sys/amd64/include/_limits.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. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 >>> TRUNCATED FOR MAIL (1000 lines) <<<