Date: Mon, 18 Aug 2003 17:05:43 -0700 (PDT) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 36381 for review Message-ID: <200308190005.h7J05hPF045263@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=36381 Change 36381 by sam@sam_ebb on 2003/08/18 17:05:08 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/alpha-gdbstub.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/critical.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/mem.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#4 integrate .. //depot/projects/netperf/sys/alpha/alpha/prom.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/swtch.s#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#5 integrate .. //depot/projects/netperf/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/netperf/sys/alpha/include/critical.h#3 integrate .. //depot/projects/netperf/sys/alpha/include/md_var.h#2 integrate .. //depot/projects/netperf/sys/alpha/include/pcb.h#2 integrate .. //depot/projects/netperf/sys/alpha/mcbus/mcbus.c#2 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/critical.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/netperf/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/netperf/sys/amd64/include/critical.h#3 integrate .. //depot/projects/netperf/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/netperf/sys/boot/Makefile#2 integrate .. //depot/projects/netperf/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/netperf/sys/conf/NOTES#5 integrate .. //depot/projects/netperf/sys/conf/files#3 integrate .. //depot/projects/netperf/sys/conf/files.i386#3 integrate .. //depot/projects/netperf/sys/conf/files.ia64#3 integrate .. //depot/projects/netperf/sys/conf/files.pc98#3 integrate .. //depot/projects/netperf/sys/conf/majors#2 integrate .. //depot/projects/netperf/sys/conf/options#5 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/netperf/sys/ddb/db_access.c#2 integrate .. //depot/projects/netperf/sys/ddb/db_command.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-dma.c#2 edit .. //depot/projects/netperf/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/netperf/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_audio.h#2 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#3 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/netperf/sys/dev/bktr/msp34xx.c#1 branch .. //depot/projects/netperf/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/netperf/sys/dev/dgb/dgb.c#2 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/netperf/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/netperf/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs.h#4 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/netperf/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/netperf/sys/dev/safe/safe.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/netperf/sys/dev/trm/trm.c#3 integrate .. //depot/projects/netperf/sys/dev/twe/twe.c#3 integrate .. //depot/projects/netperf/sys/dev/twe/twe_compat.h#3 integrate .. //depot/projects/netperf/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/netperf/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/netperf/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/netperf/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/netperf/sys/dev/vinum/vinumio.c#2 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/netperf/sys/fs/pseudofs/pseudofs_vnops.c#2 edit .. //depot/projects/netperf/sys/geom/geom_dev.c#3 integrate .. //depot/projects/netperf/sys/geom/geom_io.c#2 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#2 integrate .. //depot/projects/netperf/sys/i386/conf/PAE#2 integrate .. //depot/projects/netperf/sys/i386/i386/critical.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/exception.s#3 integrate .. //depot/projects/netperf/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/perfmon.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/support.s#2 integrate .. //depot/projects/netperf/sys/i386/i386/trap.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/netperf/sys/i386/include/apic.h#3 integrate .. //depot/projects/netperf/sys/i386/include/clock.h#3 integrate .. //depot/projects/netperf/sys/i386/include/cpu.h#2 integrate .. //depot/projects/netperf/sys/i386/include/critical.h#3 integrate .. //depot/projects/netperf/sys/i386/include/md_var.h#2 integrate .. //depot/projects/netperf/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/clock.c#3 integrate .. //depot/projects/netperf/sys/i386/isa/pcaudio.c#2 delete .. //depot/projects/netperf/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/critical.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/netperf/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/ptrace_machdep.c#1 branch .. //depot/projects/netperf/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/syscall.S#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/netperf/sys/ia64/include/cpu.h#5 integrate .. //depot/projects/netperf/sys/ia64/include/critical.h#3 integrate .. //depot/projects/netperf/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/pcb.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/ptrace.h#2 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_fork.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_synch.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_tc.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_thr.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#4 integrate .. //depot/projects/netperf/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/netperf/sys/kern/subr_blist.c#2 integrate .. //depot/projects/netperf/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/netperf/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/netperf/sys/kern/subr_mbuf.c#5 integrate .. //depot/projects/netperf/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/netperf/sys/kern/sys_process.c#4 integrate .. //depot/projects/netperf/sys/libkern/arc4random.c#2 integrate .. //depot/projects/netperf/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/netperf/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/netperf/sys/netinet/if_atm.c#4 integrate .. //depot/projects/netperf/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/netperf/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/netperf/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/netperf/sys/pc98/pc98/clock.c#3 integrate .. //depot/projects/netperf/sys/pc98/pc98/pcaudio.c#2 delete .. //depot/projects/netperf/sys/pci/if_rl.c#4 integrate .. //depot/projects/netperf/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/netperf/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/netperf/sys/powerpc/include/critical.h#3 integrate .. //depot/projects/netperf/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/critical.c#3 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/netperf/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/netperf/sys/sparc64/include/critical.h#3 integrate .. //depot/projects/netperf/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/critical.c#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/netperf/sys/sys/blist.h#2 integrate .. //depot/projects/netperf/sys/sys/param.h#3 integrate .. //depot/projects/netperf/sys/sys/pipe.h#3 integrate .. //depot/projects/netperf/sys/sys/proc.h#3 integrate .. //depot/projects/netperf/sys/sys/ptrace.h#2 integrate .. //depot/projects/netperf/sys/sys/queue.h#2 integrate .. //depot/projects/netperf/sys/sys/soundcard.h#2 integrate .. //depot/projects/netperf/sys/sys/timetc.h#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/netperf/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/netperf/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#4 integrate .. //depot/projects/netperf/sys/vm/vm_extern.h#2 integrate .. //depot/projects/netperf/sys/vm/vm_glue.c#4 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_map.h#3 integrate .. //depot/projects/netperf/sys/vm/vm_object.h#2 integrate .. //depot/projects/netperf/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/netperf/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/alpha-gdbstub.c#2 (text+ko) ==== @@ -93,7 +93,9 @@ ****************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/alpha-gdbstub.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/alpha-gdbstub.c,v 1.15 2003/08/17 06:42:07 marcel Exp $"); + +#include "opt_ddb.h" #include <sys/param.h> #include <sys/reboot.h> @@ -101,15 +103,13 @@ #include <sys/signal.h> #include <sys/cons.h> +#include <machine/md_var.h> #include <machine/prom.h> #include <machine/reg.h> +#include <machine/setjmp.h> #include <ddb/ddb.h> -#include <machine/setjmp.h> - -#include "opt_ddb.h" - /************************************************************************/ void gdb_handle_exception (db_regs_t *, int, int); ==== //depot/projects/netperf/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -25,29 +25,30 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.7 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.8 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" + #include <sys/param.h> #include <sys/reboot.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/intr.h> - #include <sys/termios.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/intr.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/pci/irongatereg.h> #include <alpha/pci/irongatevar.h> -#include "opt_dev_sc.h" - #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/clock.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.33 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.34 2003/08/17 06:42:07 marcel Exp $"); #include "opt_clock.h" @@ -58,13 +58,15 @@ #include <sys/bus.h> #include <sys/timetc.h> -#include <machine/cpuconf.h> #include <machine/bus.h> #include <machine/clock.h> #include <machine/clockvar.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> +#include <machine/rpb.h> /* for CPU definitions, etc */ + #include <isa/isareg.h> #include <alpha/alpha/timerreg.h> -#include <machine/rpb.h> /* for CPU definitions, etc */ #define SECMIN ((unsigned)60) /* seconds per minute */ #define SECHOUR ((unsigned)(60*SECMIN)) /* seconds per hour */ ==== //depot/projects/netperf/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -31,16 +31,18 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.15 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.16 2003/08/17 06:42:07 marcel Exp $"); + +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> + #include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include "opt_cpu.h" - #ifdef DEC_AXPPCI_33 extern void dec_axppci_33_init(int); #else ==== //depot/projects/netperf/sys/alpha/alpha/critical.c#3 (text+ko) ==== @@ -1,10 +1,32 @@ /*- - * Copyright (c) 2001 Matthew Dillon. This code is distributed under - * the BSD copyright, /usr/src/COPYRIGHT. + * Copyright (c) 2002 Matthew Dillon. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.5 2003/08/04 20:32:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.6 2003/08/12 23:24:03 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf/sys/alpha/alpha/db_trace.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.14 2002/09/19 20:40:26 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.15 2003/08/17 06:42:07 marcel Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -50,8 +50,9 @@ #include <sys/proc.h> #include <sys/user.h> #include <sys/sysent.h> + #include <machine/db_machdep.h> - +#include <machine/md_var.h> #include <ddb/ddb.h> #include <ddb/db_sym.h> ==== //depot/projects/netperf/sys/alpha/alpha/dec_1000a.c#2 (text+ko) ==== @@ -72,9 +72,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.15 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -82,18 +83,17 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/bus.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> -#include <machine/bus.h> #include <alpha/pci/apecsvar.h> #include <alpha/pci/ciavar.h> #include <pci/pcivar.h> -#include "opt_dev_sc.h" - #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_2100_a50.c#2 (text+ko) ==== @@ -33,9 +33,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.15 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.16 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -43,15 +44,16 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/pci/apecsreg.h> #include <alpha/pci/apecsvar.h> -#include "opt_dev_sc.h" #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_2100_a500.c#2 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.15 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -35,16 +36,17 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/bus.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> -#include <machine/bus.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/pci/t2var.h> #include <alpha/pci/t2reg.h> -#include "opt_dev_sc.h" #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_3000_300.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_300.c,v 1.5 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_300.c,v 1.6 2003/08/17 06:42:07 marcel Exp $"); #include "opt_cpu.h" @@ -38,8 +38,9 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> #include <alpha/tlsb/tlsbreg.h> #include <alpha/tlsb/gbusreg.h> ==== //depot/projects/netperf/sys/alpha/alpha/dec_3000_500.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_500.c,v 1.5 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_500.c,v 1.6 2003/08/17 06:42:07 marcel Exp $"); #include "opt_cpu.h" @@ -38,8 +38,9 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> #include <alpha/tlsb/tlsbreg.h> #include <alpha/tlsb/gbusreg.h> ==== //depot/projects/netperf/sys/alpha/alpha/dec_axppci_33.c#2 (text+ko) ==== @@ -30,9 +30,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.18 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.19 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -40,15 +41,16 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/bus.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> -#include <machine/bus.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/pci/lcavar.h> -#include "opt_dev_sc.h" #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_eb164.c#2 (text+ko) ==== @@ -30,9 +30,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.17 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.18 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -40,14 +41,13 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> #include <alpha/pci/ciavar.h> -#include "opt_dev_sc.h" - #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_eb64plus.c#2 (text+ko) ==== @@ -46,9 +46,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.13 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.14 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -56,9 +57,10 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> #include <pci/pcireg.h> #include <pci/pcivar.h> @@ -66,8 +68,6 @@ #include <alpha/pci/apecsreg.h> #include <alpha/pci/apecsvar.h> -#include "opt_dev_sc.h" - #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_kn20aa.c#2 (text+ko) ==== @@ -30,9 +30,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.15 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.16 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -40,16 +41,16 @@ #include <sys/termios.h> #include <sys/bus.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/pci/ciareg.h> #include <alpha/pci/ciavar.h> -#include "opt_dev_sc.h" - #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_kn300.c#2 (text+ko) ==== @@ -29,34 +29,30 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.10 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.11 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" + #include <sys/param.h> #include <sys/reboot.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/intr.h> - #include <sys/termios.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/intr.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/mcbus/mcbusreg.h> #include <alpha/mcbus/mcbusvar.h> -#if 0 -#include <alpha/mcbus/mcpciareg.h> -#include <alpha/mcbsu/mcpciavar.h> -#include <alpha/pci/pci_kn300.h> -#endif - -#include "opt_dev_sc.h" #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/netperf/sys/alpha/alpha/dec_kn8ae.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.13 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.14 2003/08/17 06:42:07 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,8 +39,9 @@ #include <sys/reboot.h> #include <sys/bus.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> #include <alpha/tlsb/tlsbreg.h> #include <alpha/tlsb/gbusreg.h> ==== //depot/projects/netperf/sys/alpha/alpha/dec_st550.c#2 (text+ko) ==== @@ -32,9 +32,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.13 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.14 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" #include <sys/param.h> #include <sys/reboot.h> @@ -42,20 +43,19 @@ #include <sys/kernel.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/intr.h> - #include <sys/termios.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/intr.h> +#include <machine/md_var.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/pci/ciareg.h> #include <alpha/pci/ciavar.h> -#include "opt_dev_sc.h" - #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/dec_st6600.c#2 (text+ko) ==== @@ -25,28 +25,29 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.15 2003/08/17 06:42:07 marcel Exp $"); #include "opt_ddb.h" +#include "opt_dev_sc.h" + #include <sys/param.h> #include <sys/reboot.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/intr.h> - #include <sys/termios.h> +#include <machine/clock.h> +#include <machine/cpuconf.h> +#include <machine/md_var.h> +#include <machine/intr.h> #include <machine/rpb.h> -#include <machine/cpuconf.h> -#include <machine/clock.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> #include <alpha/pci/tsunamivar.h> -#include "opt_dev_sc.h" - #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif ==== //depot/projects/netperf/sys/alpha/alpha/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.15 2003/08/17 08:08:38 gordon Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -81,7 +81,7 @@ EM_ALPHA, "FreeBSD", "", - "/usr/libexec/ld-elf.so.1", + "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec }; ==== //depot/projects/netperf/sys/alpha/alpha/fp_emulate.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.12 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.13 2003/08/17 06:42:07 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -34,6 +34,8 @@ #include <sys/proc.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/user.h> + #include <vm/vm.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> @@ -41,10 +43,12 @@ #include <vm/vm_extern.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <sys/user.h> + +#include <machine/fpu.h> #include <machine/inst.h> -#include <machine/fpu.h> +#include <machine/md_var.h> #include <machine/reg.h> + #include <alpha/alpha/ieee_float.h> #define GETREG(regs, i) (*(fp_register_t*) ®s->fpr_regs[i]) ==== //depot/projects/netperf/sys/alpha/alpha/interrupt.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.74 2003/06/14 23:23:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.75 2003/08/17 06:42:07 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,11 +51,12 @@ #include <sys/unistd.h> #include <sys/vmmeter.h> -#include <machine/reg.h> +#include <machine/bwx.h> +#include <machine/cpuconf.h> #include <machine/frame.h> -#include <machine/cpuconf.h> -#include <machine/bwx.h> #include <machine/intr.h> +#include <machine/md_var.h> +#include <machine/reg.h> #include <machine/rpb.h> #include <machine/smp.h> ==== //depot/projects/netperf/sys/alpha/alpha/mem.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.45 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.46 2003/08/17 06:42:07 marcel Exp $"); /* * Memory special file @@ -61,6 +61,7 @@ #include <sys/signalvar.h> #include <sys/uio.h> +#include <machine/md_var.h> #ifdef PERFMON #include <machine/perfmon.h> #endif ==== //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.46 2003/07/31 01:31:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.48 2003/08/17 06:42:07 marcel Exp $"); #include "opt_kstack_pages.h" @@ -42,17 +42,18 @@ #include <sys/smp.h> #include <sys/sysctl.h> #include <sys/bus.h> +#include <sys/user.h> #include <vm/vm.h> #include <vm/pmap.h> #include <vm/vm_map.h> -#include <sys/user.h> #include <machine/atomic.h> +#include <machine/clock.h> +#include <machine/md_var.h> #include <machine/pmap.h> +#include <machine/prom.h> #include <machine/rpb.h> -#include <machine/clock.h> -#include <machine/prom.h> #include <machine/smp.h> /* Set to 1 once we're ready to let the APs out of the pen. */ @@ -208,7 +209,7 @@ /* ok, now grab sched_lock and enter the scheduler */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308190005.h7J05hPF045263>