CVS commit: src/sys/arch

[Manuel Bouyer <bouyer%netbsd.org@localhost>]

Module Name:    src
Committed By:   bouyer
Date:           Fri Jan 11 20:00:54 UTC 2008

Modified Files:
        src/sys/arch/i386/i386: bios32.c db_memrw.c gdt.c genassym.cf locore.S
            machdep.c spl.S vector.S
        src/sys/arch/i386/include: cpu.h frameasm.h pmap.h segments.h types.h
            vmparam.h
        src/sys/arch/i386/isa: npx.c
        src/sys/arch/x86/include: pmap.h
        src/sys/arch/x86/x86: bus_space.c pmap.c
        src/sys/arch/xen/conf: Makefile.xen files.compat files.xen
        src/sys/arch/xen/i386: npx_hv.c
        src/sys/arch/xen/include: intr.h xbdvar.h xen.h xenfunc.h xenpmap.h
        src/sys/arch/xen/x86: cpu.c intr.c mainbus.c x86_xpmap.c xenfunc.c
        src/sys/arch/xen/xen: ctrl_if.c evtchn.c hypervisor.c xenevt.c
            xennetback.c
        src/sys/arch/xen/xenbus: xenbus_xs.c
Added Files:
        src/sys/arch/xen/include/i386: bus_private.h hypercalls.h i82093var.h
            i82489var.h intr.h pci_machdep.h pic.h
Removed Files:
        src/sys/arch/xen/i386: bios32.c gdt.c genassym.cf locore.S machdep.c
            npx.c pmap.c spl.S vector.S xpmap.c
        src/sys/arch/xen/include: acpi_func.h acpi_machdep.h bus.h cpu.h
            cpufunc.h frameasm.h hypercalls.h i82093reg.h i82489reg.h
            intrdefs.h isa_machdep.h mpbiosvar.h mutex.h pmap.h rwlock.h
            segments.h types.h vmparam.h
        src/sys/arch/xen/include/amd64: intrdefs.h mpacpi.h mutex.h rwlock.h

Log Message:
Merge the bouyer-xeni386 branch to head, at tag bouyer-xeni386-merge1 (the
branch is still active and will see i386PAE support developement).
Sumary of changes:
- switch xeni386 to the x86/x86/pmap.c, and the xen/x86/x86_xpmap.c
  pmap bootstrap.
- merge back most of xen/i386/ to i386/i386
- change the build to reduce diffs between i386 and amd64 in file locations
- remove include files that were identical to the i386/amd64 counterparts,
  the build will find them via the xen-ma/machine link.


To generate a diff of this commit:
cvs rdiff -r1.17 -r1.18 src/sys/arch/i386/i386/bios32.c
cvs rdiff -r1.22 -r1.23 src/sys/arch/i386/i386/db_memrw.c
cvs rdiff -r1.43 -r1.44 src/sys/arch/i386/i386/gdt.c
cvs rdiff -r1.60 -r1.61 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -r1.61 -r1.62 src/sys/arch/i386/i386/locore.S
cvs rdiff -r1.621 -r1.622 src/sys/arch/i386/i386/machdep.c
cvs rdiff -r1.25 -r1.26 src/sys/arch/i386/i386/spl.S
cvs rdiff -r1.33 -r1.34 src/sys/arch/i386/i386/vector.S
cvs rdiff -r1.157 -r1.158 src/sys/arch/i386/include/cpu.h
cvs rdiff -r1.10 -r1.11 src/sys/arch/i386/include/frameasm.h
cvs rdiff -r1.97 -r1.98 src/sys/arch/i386/include/pmap.h
cvs rdiff -r1.47 -r1.48 src/sys/arch/i386/include/segments.h
cvs rdiff -r1.54 -r1.55 src/sys/arch/i386/include/types.h
cvs rdiff -r1.65 -r1.66 src/sys/arch/i386/include/vmparam.h
cvs rdiff -r1.121 -r1.122 src/sys/arch/i386/isa/npx.c
cvs rdiff -r1.9 -r1.10 src/sys/arch/x86/include/pmap.h
cvs rdiff -r1.14 -r1.15 src/sys/arch/x86/x86/bus_space.c
cvs rdiff -r1.23 -r1.24 src/sys/arch/x86/x86/pmap.c
cvs rdiff -r1.23 -r1.24 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -r1.15 -r1.16 src/sys/arch/xen/conf/files.compat
cvs rdiff -r1.76 -r1.77 src/sys/arch/xen/conf/files.xen
cvs rdiff -r1.5 -r0 src/sys/arch/xen/i386/bios32.c
cvs rdiff -r1.11 -r0 src/sys/arch/xen/i386/gdt.c src/sys/arch/xen/i386/npx.c
cvs rdiff -r1.19 -r0 src/sys/arch/xen/i386/genassym.cf
cvs rdiff -r1.37 -r0 src/sys/arch/xen/i386/locore.S
cvs rdiff -r1.52 -r0 src/sys/arch/xen/i386/machdep.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/i386/npx_hv.c
cvs rdiff -r1.40 -r0 src/sys/arch/xen/i386/pmap.c
cvs rdiff -r1.13 -r0 src/sys/arch/xen/i386/spl.S
cvs rdiff -r1.22 -r0 src/sys/arch/xen/i386/vector.S
cvs rdiff -r1.2 -r0 src/sys/arch/xen/i386/xpmap.c
cvs rdiff -r1.1 -r0 src/sys/arch/xen/include/acpi_func.h \
    src/sys/arch/xen/include/acpi_machdep.h \
    src/sys/arch/xen/include/i82093reg.h src/sys/arch/xen/include/i82489reg.h \
    src/sys/arch/xen/include/mpbiosvar.h
cvs rdiff -r1.3 -r0 src/sys/arch/xen/include/bus.h \
    src/sys/arch/xen/include/isa_machdep.h
cvs rdiff -r1.28 -r0 src/sys/arch/xen/include/cpu.h
cvs rdiff -r1.19 -r0 src/sys/arch/xen/include/cpufunc.h
cvs rdiff -r1.5 -r0 src/sys/arch/xen/include/frameasm.h
cvs rdiff -r1.2 -r0 src/sys/arch/xen/include/hypercalls.h \
    src/sys/arch/xen/include/mutex.h src/sys/arch/xen/include/rwlock.h \
    src/sys/arch/xen/include/vmparam.h
cvs rdiff -r1.21 -r1.22 src/sys/arch/xen/include/intr.h
cvs rdiff -r1.8 -r0 src/sys/arch/xen/include/intrdefs.h
cvs rdiff -r1.18 -r0 src/sys/arch/xen/include/pmap.h
cvs rdiff -r1.7 -r0 src/sys/arch/xen/include/segments.h
cvs rdiff -r1.9 -r0 src/sys/arch/xen/include/types.h
cvs rdiff -r1.9 -r1.10 src/sys/arch/xen/include/xbdvar.h
cvs rdiff -r1.25 -r1.26 src/sys/arch/xen/include/xen.h
cvs rdiff -r1.13 -r1.14 src/sys/arch/xen/include/xenfunc.h
cvs rdiff -r1.17 -r1.18 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -r1.2 -r0 src/sys/arch/xen/include/amd64/intrdefs.h \
    src/sys/arch/xen/include/amd64/mpacpi.h \
    src/sys/arch/xen/include/amd64/mutex.h \
    src/sys/arch/xen/include/amd64/rwlock.h
cvs rdiff -r0 -r1.2 src/sys/arch/xen/include/i386/bus_private.h \
    src/sys/arch/xen/include/i386/hypercalls.h \
    src/sys/arch/xen/include/i386/i82093var.h \
    src/sys/arch/xen/include/i386/i82489var.h \
    src/sys/arch/xen/include/i386/intr.h \
    src/sys/arch/xen/include/i386/pci_machdep.h \
    src/sys/arch/xen/include/i386/pic.h
cvs rdiff -r1.6 -r1.7 src/sys/arch/xen/x86/cpu.c
cvs rdiff -r1.16 -r1.17 src/sys/arch/xen/x86/intr.c
cvs rdiff -r1.2 -r1.3 src/sys/arch/xen/x86/mainbus.c \
    src/sys/arch/xen/x86/xenfunc.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -r1.17 -r1.18 src/sys/arch/xen/xen/ctrl_if.c
cvs rdiff -r1.29 -r1.30 src/sys/arch/xen/xen/evtchn.c \
    src/sys/arch/xen/xen/xennetback.c
cvs rdiff -r1.32 -r1.33 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -r1.18 -r1.19 src/sys/arch/xen/xen/xenevt.c
cvs rdiff -r1.12 -r1.13 src/sys/arch/xen/xenbus/xenbus_xs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.