Date: Tue, 13 Apr 2004 17:48:09 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 51020 for review Message-ID: <200404140048.i3E0m9ZA063011@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=51020 Change 51020 by peter@peter_daintree on 2004/04/13 17:47:38 integ -I -b i386_hammer (mostly license spam) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.S#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#63 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#40 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#25 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#28 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/exec.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/fpu.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#25 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#30 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/psl.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/ptrace.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/reloc.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/trap.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/tss.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/varargs.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#19 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#15 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#20 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#19 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#8 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#11 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.h#6 integrate .. //depot/projects/hammer/sys/amd64/isa/nmi.c#10 integrate .. //depot/projects/hammer/sys/amd64/isa/timerreg.h#7 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#25 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#27 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#33 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#28 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#9 (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. ==== //depot/projects/hammer/sys/amd64/amd64/locore.S#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#63 (text+ko) ==== @@ -2075,7 +2075,7 @@ * to be used for panic dumps. */ void * -pmap_kenter_temporary(vm_offset_t pa, int i) +pmap_kenter_temporary(vm_paddr_t pa, int i) { vm_offset_t va; ==== //depot/projects/hammer/sys/amd64/amd64/support.S#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#40 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#25 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1150) +# (XXX from i386:NOTES,v 1.1152) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # @@ -432,6 +432,10 @@ # #--------------------------------------------------------------------------- +# sx device is i386 and pc98 only at the moment. +device sx +options SX_DEBUG + # # Set the number of PV entries per process. Increasing this can # stop panics related to heavy use of shared memory. However, that can ==== //depot/projects/hammer/sys/amd64/include/_limits.h#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asm.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpu.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#28 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/endian.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/exec.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/float.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/fpu.h#5 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/frame.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/limits.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/md_var.h#25 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/param.h#15 (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. ==== //depot/projects/hammer/sys/amd64/include/pcb.h#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#30 (text+ko) ==== @@ -263,7 +263,7 @@ void pmap_bootstrap(vm_paddr_t *); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); -void *pmap_kenter_temporary(vm_offset_t pa, int i); +void *pmap_kenter_temporary(vm_paddr_t pa, int i); void pmap_kremove(vm_offset_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); ==== //depot/projects/hammer/sys/amd64/include/proc.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/profile.h#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/psl.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ptrace.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/reg.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/reloc.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/segments.h#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/signal.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/trap.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/tss.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/varargs.h#7 (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. ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#19 (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. ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu.h#19 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.h#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/nmi.c#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/timerreg.h#7 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404140048.i3E0m9ZA063011>