Date: Sat, 5 Apr 2003 02:02:57 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28203 for review Message-ID: <200304051002.h35A2vOS043789@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28203 Change 28203 by peter@peter_overcee on 2003/04/05 02:02:57 update include paths update segment names Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/clock.c#10 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#9 edit .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#4 edit .. //depot/projects/hammer/sys/x86_64/isa/ithread.c#3 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#18 edit .. //depot/projects/hammer/sys/x86_64/isa/vector.s#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#38 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#8 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#21 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#14 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#10 (text+ko) ==== @@ -71,15 +71,15 @@ #include <machine/psl.h> #include <machine/specialreg.h> -#include <i386/isa/icu.h> -#include <i386/isa/isa.h> +#include <x86_64/isa/icu.h> +#include <x86_64/isa/isa.h> #include <isa/rtc.h> #ifdef DEV_ISA #include <isa/isavar.h> #endif -#include <i386/isa/timerreg.h> +#include <x86_64/isa/timerreg.h> -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/intr_machdep.h> /* * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#9 (text+ko) ==== @@ -37,7 +37,6 @@ * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.74 2003/03/24 19:14:46 mdodd Exp $ */ -#include "opt_auto_eoi.h" #include "opt_isa.h" #include <sys/param.h> @@ -58,13 +57,13 @@ #include <machine/md_var.h> #include <machine/segments.h> -#include <i386/isa/isa.h> -#include <i386/isa/icu.h> +#include <x86_64/isa/isa.h> +#include <x86_64/isa/icu.h> #ifdef DEV_ISA #include <isa/isavar.h> #endif -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/intr_machdep.h> #include <sys/interrupt.h> /* @@ -387,7 +386,7 @@ intr_unit[intr] = arg; setidt(ICU_OFFSET + intr, flags & INTR_FAST ? fastintr[intr] : slowintr[intr], - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + SDT_SYSIGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); INTREN(1 << intr); mtx_unlock_spin(&icu_lock); intr_restore(crit); @@ -415,7 +414,7 @@ intr_countp[intr] = &intrcnt[1 + intr]; intr_handler[intr] = isa_strayintr; intr_unit[intr] = &intr_unit[intr]; - setidt(ICU_OFFSET + intr, slowintr[intr], SDT_SYS386IGT, SEL_KPL, + setidt(ICU_OFFSET + intr, slowintr[intr], SDT_SYSIGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); mtx_unlock_spin(&icu_lock); intr_restore(crit); ==== //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <i386/isa/isa.h> +#include <x86_64/isa/isa.h> #include <dev/ic/i8237.h> #include <isa/isavar.h> ==== //depot/projects/hammer/sys/x86_64/isa/ithread.c#3 (text+ko) ==== @@ -37,8 +37,8 @@ #include <sys/systm.h> #include <sys/vmmeter.h> -#include <i386/isa/icu.h> -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/icu.h> +#include <x86_64/isa/intr_machdep.h> struct int_entropy { struct proc *p; ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#18 (text+ko) ==== @@ -67,7 +67,7 @@ #include <machine/segments.h> #include <machine/ucontext.h> -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/intr_machdep.h> #ifdef DEV_ISA #include <isa/isavar.h> #endif ==== //depot/projects/hammer/sys/x86_64/isa/vector.s#6 (text+ko) ==== @@ -3,9 +3,9 @@ * $FreeBSD: src/sys/i386/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $ */ -#include <i386/isa/icu.h> -#include <i386/isa/isa.h> -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/icu.h> +#include <x86_64/isa/isa.h> +#include <x86_64/isa/intr_machdep.h> #define FAST_INTR_HANDLER_USES_ES 1 #ifdef FAST_INTR_HANDLER_USES_ES ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#6 (text+ko) ==== @@ -74,7 +74,7 @@ #include <nfsclient/nfsdiskless.h> #include <machine/md_var.h> -#include <i386/isa/icu.h> +#include <x86_64/isa/icu.h> #ifdef DEV_ISA #include <isa/isavar.h> ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#38 (text+ko) ==== @@ -104,8 +104,8 @@ #include <machine/perfmon.h> #endif -#include <i386/isa/icu.h> -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/icu.h> +#include <x86_64/isa/intr_machdep.h> #include <isa/rtc.h> #include <sys/ptrace.h> #include <machine/sigframe.h> ==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#8 (text+ko) ==== @@ -61,10 +61,10 @@ #ifdef DEV_ISA #include <isa/isavar.h> -#include <i386/isa/isa.h> +#include <x86_64/isa/isa.h> #endif -#include <i386/isa/icu.h> -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/icu.h> +#include <x86_64/isa/intr_machdep.h> #include <sys/rtprio.h> static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#21 (text+ko) ==== @@ -81,8 +81,8 @@ #include <machine/pcb.h> #include <machine/tss.h> -#include <i386/isa/icu.h> -#include <i386/isa/intr_machdep.h> +#include <x86_64/isa/icu.h> +#include <x86_64/isa/intr_machdep.h> #include <ddb/ddb.h> ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#14 (text+ko) ==== @@ -73,7 +73,7 @@ #include <sys/user.h> -#include <i386/isa/isa.h> +#include <x86_64/isa/isa.h> static void cpu_reset_real(void); extern int _ucodesel, _udatasel;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304051002.h35A2vOS043789>