Date: Tue, 19 Aug 2003 01:50:34 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 36402 for review Message-ID: <200308190850.h7J8oYnq086780@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=36402 Change 36402 by marcel@marcel_nfs on 2003/08/19 01:49:32 IFC @36399 Affected files ... .. //depot/projects/uart/alpha/alpha/alpha-gdbstub.c#2 integrate .. //depot/projects/uart/alpha/alpha/api_up1000.c#3 integrate .. //depot/projects/uart/alpha/alpha/clock.c#2 integrate .. //depot/projects/uart/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/uart/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/uart/alpha/alpha/dec_1000a.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_2100_a50.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_2100_a500.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/uart/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/uart/alpha/alpha/dec_axppci_33.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_eb164.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_eb64plus.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_kn20aa.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_kn300.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/uart/alpha/alpha/dec_st550.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_st6600.c#3 integrate .. //depot/projects/uart/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/uart/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/uart/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/uart/alpha/alpha/mem.c#2 integrate .. //depot/projects/uart/alpha/alpha/mp_machdep.c#7 integrate .. //depot/projects/uart/alpha/alpha/prom.c#2 integrate .. //depot/projects/uart/alpha/alpha/vm_machdep.c#5 integrate .. //depot/projects/uart/alpha/include/cpu.h#2 integrate .. //depot/projects/uart/alpha/include/md_var.h#2 integrate .. //depot/projects/uart/alpha/include/pcb.h#2 integrate .. //depot/projects/uart/alpha/mcbus/mcbus.c#2 integrate .. //depot/projects/uart/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/uart/alpha/pci/apecs.c#2 integrate .. //depot/projects/uart/alpha/pci/cia.c#2 integrate .. //depot/projects/uart/alpha/pci/irongate.c#2 integrate .. //depot/projects/uart/alpha/pci/lca.c#2 integrate .. //depot/projects/uart/alpha/pci/t2.c#2 integrate .. //depot/projects/uart/alpha/pci/tsunami.c#2 integrate .. //depot/projects/uart/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/uart/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#11 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/uart/amd64/include/cpu.h#2 integrate .. //depot/projects/uart/amd64/include/md_var.h#2 integrate .. //depot/projects/uart/boot/Makefile#2 integrate .. //depot/projects/uart/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/uart/ddb/db_command.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/uart/dev/acpica/acpiio.h#2 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/uart/dev/drm/ati_pcigart.h#2 integrate .. //depot/projects/uart/dev/drm/drm.h#2 integrate .. //depot/projects/uart/dev/drm/drmP.h#2 integrate .. //depot/projects/uart/dev/drm/drm_agpsupport.h#2 integrate .. //depot/projects/uart/dev/drm/drm_auth.h#2 integrate .. //depot/projects/uart/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/uart/dev/drm/drm_context.h#2 integrate .. //depot/projects/uart/dev/drm/drm_dma.h#2 integrate .. //depot/projects/uart/dev/drm/drm_drawable.h#2 integrate .. //depot/projects/uart/dev/drm/drm_drv.h#2 integrate .. //depot/projects/uart/dev/drm/drm_fops.h#2 integrate .. //depot/projects/uart/dev/drm/drm_ioctl.h#2 integrate .. //depot/projects/uart/dev/drm/drm_lock.h#2 integrate .. //depot/projects/uart/dev/drm/drm_memory.h#2 integrate .. //depot/projects/uart/dev/drm/drm_memory_debug.h#1 branch .. //depot/projects/uart/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/uart/dev/drm/drm_pci.h#1 branch .. //depot/projects/uart/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/uart/dev/drm/drm_scatter.h#2 integrate .. //depot/projects/uart/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/uart/dev/drm/drm_vm.h#2 integrate .. //depot/projects/uart/dev/drm/mga.h#2 integrate .. //depot/projects/uart/dev/drm/mga_dma.c#2 integrate .. //depot/projects/uart/dev/drm/mga_drv.c#2 integrate .. //depot/projects/uart/dev/drm/mga_drv.h#2 integrate .. //depot/projects/uart/dev/drm/mga_irq.c#2 integrate .. //depot/projects/uart/dev/drm/mga_warp.c#2 integrate .. //depot/projects/uart/dev/drm/r128.h#2 integrate .. //depot/projects/uart/dev/drm/r128_cce.c#2 integrate .. //depot/projects/uart/dev/drm/r128_drm.h#2 integrate .. //depot/projects/uart/dev/drm/r128_drv.c#2 integrate .. //depot/projects/uart/dev/drm/r128_drv.h#2 integrate .. //depot/projects/uart/dev/drm/r128_irq.c#2 integrate .. //depot/projects/uart/dev/drm/r128_state.c#2 integrate .. //depot/projects/uart/dev/drm/radeon.h#2 integrate .. //depot/projects/uart/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/uart/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/uart/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/uart/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/uart/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/uart/dev/drm/radeon_state.c#2 integrate .. //depot/projects/uart/dev/drm/tdfx.h#2 integrate .. //depot/projects/uart/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/uart/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/uart/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/uart/i386/i386/perfmon.c#3 integrate .. //depot/projects/uart/i386/i386/pmap.c#11 integrate .. //depot/projects/uart/i386/i386/tsc.c#3 integrate .. //depot/projects/uart/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/uart/i386/include/cpu.h#2 integrate .. //depot/projects/uart/i386/include/md_var.h#2 integrate .. //depot/projects/uart/i386/isa/clock.c#4 integrate .. //depot/projects/uart/ia64/acpica/madt.c#2 integrate .. //depot/projects/uart/ia64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/uart/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/uart/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/uart/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/uart/ia64/include/cpu.h#5 integrate .. //depot/projects/uart/ia64/include/md_var.h#2 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/uart/kern/kern_shutdown.c#2 integrate .. //depot/projects/uart/kern/kern_tc.c#4 integrate .. //depot/projects/uart/kern/subr_devstat.c#2 integrate .. //depot/projects/uart/kern/subr_mbuf.c#4 integrate .. //depot/projects/uart/pc98/pc98/clock.c#3 integrate .. //depot/projects/uart/powerpc/include/cpu.h#2 integrate .. //depot/projects/uart/powerpc/include/md_var.h#2 integrate .. //depot/projects/uart/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/uart/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/uart/sparc64/include/cpu.h#2 integrate .. //depot/projects/uart/sparc64/include/md_var.h#2 integrate .. //depot/projects/uart/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/uart/sys/param.h#6 integrate .. //depot/projects/uart/sys/proc.h#6 integrate .. //depot/projects/uart/sys/timetc.h#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/uart/vm/vm_glue.c#5 integrate .. //depot/projects/uart/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/uart/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/uart/alpha/alpha/api_up1000.c#3 (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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/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/uart/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/uart/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/uart/alpha/alpha/dec_1000a.c#3 (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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/alpha/alpha/dec_2100_a50.c#3 (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,16 +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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/alpha/alpha/dec_2100_a500.c#3 (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,17 +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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/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/uart/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/uart/alpha/alpha/dec_axppci_33.c#3 (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,16 +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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/alpha/alpha/dec_eb164.c#3 (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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/alpha/alpha/dec_eb64plus.c#3 (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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/alpha/alpha/dec_kn20aa.c#3 (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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/alpha/alpha/dec_kn300.c#3 (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 NO_SIO #ifndef CONSPEED ==== //depot/projects/uart/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/uart/alpha/alpha/dec_st550.c#3 (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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/alpha/alpha/dec_st6600.c#3 (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 NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/uart/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/uart/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/uart/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/uart/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/uart/alpha/alpha/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.47 2003/08/12 19:33:35 jhb 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. */ ==== //depot/projects/uart/alpha/alpha/prom.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.27 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.28 2003/08/17 06:42:07 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,8 +38,9 @@ #include <sys/user.h> #include <sys/cons.h> +#include <machine/md_var.h> +#include <machine/prom.h> #include <machine/rpb.h> -#include <machine/prom.h> #include <machine/vmparam.h> struct rpb *hwrpb; ==== //depot/projects/uart/alpha/alpha/vm_machdep.c#5 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.92 2003/08/11 01:38:23 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.93 2003/08/16 23:15:13 marcel Exp $"); #include "opt_kstack_pages.h" @@ -266,6 +266,23 @@ } void +cpu_thread_swapin(struct thread *td) +{ + /* + * The pcb may be at a different physical address now so cache the + * new address. + */ + td->td_md.md_pcbpaddr = (void *)vtophys((vm_offset_t)td->td_pcb); +} + +void +cpu_thread_swapout(struct thread *td) +{ + /* Make sure we aren't fpcurthread. */ + alpha_fpstate_save(td, 1); +} + +void cpu_set_upcall(struct thread *td, struct thread *td0) { struct pcb *pcb2; ==== //depot/projects/uart/alpha/include/cpu.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.34 2002/11/16 06:35:51 deischen Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.36 2003/08/17 06:42:07 marcel Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -52,8 +52,6 @@ #include <machine/frame.h> -#define cpu_getstack(td) (alpha_pal_rdusp()) - /* * Arguments to hardclock and gatherstats encapsulate the previous * machine state in an opaque clockframe. One the Alpha, we use @@ -98,61 +96,13 @@ #ifdef _KERNEL -struct pcb; -struct thread; -struct reg; -struct rpb; -struct trapframe; +#define cpu_getstack(td) (alpha_pal_rdusp()) +#define get_cyclecount alpha_rpcc -extern struct rpb *hwrpb; -extern volatile int mc_expected, mc_received; - -void XentArith(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ -void XentIF(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ -void XentInt(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ -void XentMM(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ -void XentRestart(void); /* MAGIC */ -void XentSys(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ -void XentUna(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ -void alpha_init(u_long, u_long, u_long, u_long, u_long); -void alpha_fpstate_check(struct thread *td); -void alpha_fpstate_drop(struct thread *td); -void alpha_fpstate_save(struct thread *td, int write); -void alpha_fpstate_switch(struct thread *td); -int alpha_pa_access(u_long); -int badaddr (void *, size_t); -int badaddr_read(void *, size_t, void *); -u_int64_t console_restart(u_int64_t, u_int64_t, u_int64_t); -void dumpconf(void); -void exception_return(void); /* MAGIC */ -void frametoreg(struct trapframe *, struct reg *); -long fswintrberr(void); /* MAGIC */ -void init_prom_interface(struct rpb*); -void interrupt(unsigned long, unsigned long, unsigned long, - struct trapframe *); -void machine_check(unsigned long, struct trapframe *, unsigned long, - unsigned long); -u_int64_t hwrpb_checksum(void); -void hwrpb_restart_setup(void); -void regdump(struct trapframe *); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308190850.h7J8oYnq086780>