sync with head. yamt-uio_vmspace
authoryamt <yamt@NetBSD.org>
Sat, 18 Feb 2006 15:38:30 +0000
branchyamt-uio_vmspace
changeset 288598 d9d9595fb34d
parent 288597 71b7d42d3f1f
child 288599 ab4494bc6d04
sync with head.
sys/altq/altq_var.h
sys/arch/acorn26/acorn26/cpuswitch.c
sys/arch/acorn26/acorn26/vm_machdep.c
sys/arch/acorn26/conf/FOURMEG
sys/arch/acorn26/conf/GENERIC
sys/arch/acorn26/conf/INSTALL
sys/arch/acorn26/include/pmap.h
sys/arch/acorn26/ioc/arcpp.c
sys/arch/acorn26/ioc/if_eca.c
sys/arch/acorn32/conf/EB7500ATX
sys/arch/acorn32/conf/GENERIC
sys/arch/acorn32/conf/INSTALL
sys/arch/acorn32/conf/LOWMEM_WSCONS
sys/arch/acorn32/conf/NC
sys/arch/acorn32/conf/NC_WSCONS
sys/arch/acorn32/conf/RPC_WSCONS
sys/arch/algor/algor/autoconf.c
sys/arch/algor/algor/machdep.c
sys/arch/algor/conf/P4032
sys/arch/algor/conf/P5064
sys/arch/algor/conf/P6032
sys/arch/algor/include/pci_machdep.h
sys/arch/alpha/conf/ALPHA
sys/arch/alpha/conf/BASIL
sys/arch/alpha/conf/FRAU-FARBISSINA
sys/arch/alpha/conf/GENERIC
sys/arch/alpha/conf/INSTALL
sys/arch/alpha/conf/RAWHIDE
sys/arch/alpha/include/alpha_cpu.h
sys/arch/alpha/include/bwx.h
sys/arch/alpha/include/cpu_counter.h
sys/arch/alpha/include/intr.h
sys/arch/alpha/include/pmap.h
sys/arch/alpha/include/userret.h
sys/arch/alpha/pci/pci_6600.c
sys/arch/amd64/amd64/genassym.cf
sys/arch/amd64/amd64/linux32_sigcode.S
sys/arch/amd64/amd64/linux32_syscall.c
sys/arch/amd64/amd64/mainbus.c
sys/arch/amd64/conf/GENERIC
sys/arch/amd64/conf/INSTALL
sys/arch/amd64/conf/SIMICS
sys/arch/amd64/conf/files.amd64
sys/arch/amd64/include/Makefile
sys/arch/amd64/include/cpu_counter.h
sys/arch/amd64/include/linux32_machdep.h
sys/arch/amd64/include/param.h
sys/arch/amd64/include/pmap.h
sys/arch/amd64/include/profile.h
sys/arch/amd64/include/userret.h
sys/arch/amd64/pci/pchb.c
sys/arch/amd64/pci/pchbvar.h
sys/arch/amiga/conf/AMIGA
sys/arch/amiga/conf/DRACO
sys/arch/amiga/conf/GENERIC
sys/arch/amiga/conf/GENERIC.in
sys/arch/amiga/conf/INSTALL
sys/arch/amiga/conf/MDINSTALL
sys/arch/amiga/conf/WSCONS
sys/arch/amiga/include/pmap.h
sys/arch/amigappc/conf/NULL
sys/arch/amigappc/include/bus.h
sys/arch/amigappc/include/intr.h
sys/arch/arc/conf/ARCTIC
sys/arch/arc/conf/GENERIC
sys/arch/arc/conf/M403
sys/arch/arc/conf/MIMORI
sys/arch/arc/conf/PCCONS
sys/arch/arc/conf/PICA
sys/arch/arc/conf/RAMDISK
sys/arch/arc/conf/RPC44
sys/arch/arc/include/bus.h
sys/arch/arm/ep93xx/ep93xxreg.h
sys/arch/arm/ep93xx/epe.c
sys/arch/atari/conf/ATARITT
sys/arch/atari/conf/BOOT
sys/arch/atari/conf/BOOTX
sys/arch/atari/conf/FALCON
sys/arch/atari/conf/GENERIC.in
sys/arch/atari/conf/HADES
sys/arch/atari/conf/MILAN-ISAIDE
sys/arch/atari/conf/MILAN-PCIIDE
sys/arch/atari/include/pmap.h
sys/arch/bebox/conf/GENERIC
sys/arch/bebox/conf/INSTALL
sys/arch/bebox/include/intr.h
sys/arch/bebox/include/kgdb.h
sys/arch/cats/conf/GENERIC
sys/arch/cats/conf/INSTALL
sys/arch/cesfic/conf/GENERIC
sys/arch/cobalt/conf/GENERIC
sys/arch/cobalt/conf/INSTALL
sys/arch/cobalt/include/bus.h
sys/arch/cobalt/include/param.h
sys/arch/cobalt/pci/pci_machdep.c
sys/arch/dreamcast/conf/GENERIC
sys/arch/evbarm/armadillo/armadillo9_com.c
sys/arch/evbarm/armadillo/armadillo9_iic.c
sys/arch/evbarm/armadillo/armadillo9_machdep.c
sys/arch/evbarm/armadillo/armadillo9_start.S
sys/arch/evbarm/armadillo/armadillo9var.h
sys/arch/evbarm/conf/ADI_BRH
sys/arch/evbarm/conf/ARMADILLO210
sys/arch/evbarm/conf/ARMADILLO9
sys/arch/evbarm/conf/INTEGRATOR
sys/arch/evbarm/conf/IQ31244
sys/arch/evbarm/conf/IQ80310
sys/arch/evbarm/conf/IQ80321
sys/arch/evbarm/conf/IXDP425
sys/arch/evbarm/conf/IXM1200
sys/arch/evbarm/conf/LUBBOCK
sys/arch/evbarm/conf/NAPPI
sys/arch/evbarm/conf/SMDK2410
sys/arch/evbarm/conf/SMDK2800
sys/arch/evbarm/conf/TEAMASA_NPWR
sys/arch/evbarm/conf/TEAMASA_NPWR_FC
sys/arch/evbarm/conf/TS7200
sys/arch/evbarm/conf/TWINTAIL
sys/arch/evbarm/conf/VIPER
sys/arch/evbarm/conf/ZAO425
sys/arch/evbarm/conf/files.armadillo9
sys/arch/evbarm/conf/std.armadillo9
sys/arch/evbarm/include/bootconfig.h
sys/arch/evbmips/alchemy/autoconf.c
sys/arch/evbmips/alchemy/board.h
sys/arch/evbmips/alchemy/dbau1500.c
sys/arch/evbmips/alchemy/dbau1500reg.h
sys/arch/evbmips/alchemy/dbau1550.c
sys/arch/evbmips/alchemy/dbau1550reg.h
sys/arch/evbmips/alchemy/genericbd.c
sys/arch/evbmips/alchemy/mach_intr.c
sys/arch/evbmips/alchemy/machdep.c
sys/arch/evbmips/alchemy/obio.c
sys/arch/evbmips/alchemy/obiovar.h
sys/arch/evbmips/alchemy/pb1000_intr.c
sys/arch/evbmips/alchemy/pb1000_obio.c
sys/arch/evbmips/alchemy/pb1000_obiovar.h
sys/arch/evbmips/alchemy/pb1000var.h
sys/arch/evbmips/alchemy/pciide_machdep.c
sys/arch/evbmips/conf/ALCHEMY
sys/arch/evbmips/conf/DBAU1500
sys/arch/evbmips/conf/DBAU1550
sys/arch/evbmips/conf/MALTA
sys/arch/evbmips/conf/PB1000
sys/arch/evbmips/conf/files.alchemy
sys/arch/evbmips/conf/files.pb1000
sys/arch/evbmips/conf/std.alchemy
sys/arch/evbmips/conf/std.pb1000
sys/arch/evbmips/include/intr.h
sys/arch/evbmips/malta/malta_intr.c
sys/arch/evbppc/conf/EV64260
sys/arch/evbppc/conf/EXPLORA451
sys/arch/evbppc/conf/OPENBLOCKS200
sys/arch/evbppc/conf/OPENBLOCKS266
sys/arch/evbppc/conf/WALNUT
sys/arch/evbppc/ev64260/gt_mainbus.c
sys/arch/evbppc/walnut/autoconf.c
sys/arch/evbppc/walnut/pci/pci_machdep.c
sys/arch/ews4800mips/conf/GENERIC
sys/arch/hp300/conf/GENERIC
sys/arch/hp300/conf/INSTALL
sys/arch/hp300/include/bus.h
sys/arch/hp300/include/cacheops_machdep.h
sys/arch/hp700/conf/GENERIC
sys/arch/hp700/include/cpu.h
sys/arch/hp700/include/intr.h
sys/arch/hpc/include/config_hook.h
sys/arch/hpcarm/conf/IPAQ
sys/arch/hpcarm/conf/JORNADA720
sys/arch/hpcarm/conf/JORNADA820
sys/arch/hpcmips/conf/GENERIC
sys/arch/hpcmips/conf/INSTALL_TX3912
sys/arch/hpcmips/conf/LCARD
sys/arch/hpcmips/conf/LROUTER
sys/arch/hpcmips/conf/MPC303
sys/arch/hpcmips/conf/RAMDISK
sys/arch/hpcmips/conf/TX3912
sys/arch/hpcmips/conf/TX3922
sys/arch/hpcmips/conf/VR41XX
sys/arch/hpcsh/conf/GENERIC
sys/arch/hpcsh/conf/HPW650PA
sys/arch/hppa/include/byte_swap.h
sys/arch/hppa/include/db_machdep.h
sys/arch/hppa/include/pmap.h
sys/arch/hppa/include/profile.h
sys/arch/hppa/spmath/Makefile.inc
sys/arch/i386/acpi/acpi_wakeup.c
sys/arch/i386/conf/DISKLESS
sys/arch/i386/conf/GENERIC
sys/arch/i386/conf/GENERIC_LAPTOP
sys/arch/i386/conf/GENERIC_PS2TINY
sys/arch/i386/conf/GENERIC_TINY
sys/arch/i386/conf/INSTALL
sys/arch/i386/conf/INSTALL_LAPTOP
sys/arch/i386/conf/INSTALL_SMALL
sys/arch/i386/conf/INSTALL_TINY
sys/arch/i386/conf/INSTALL_XENU
sys/arch/i386/conf/IOPENER
sys/arch/i386/conf/LAMB
sys/arch/i386/conf/NET4501
sys/arch/i386/conf/SWINGER
sys/arch/i386/conf/VIRTUALPC
sys/arch/i386/conf/XEN0
sys/arch/i386/conf/XENU
sys/arch/i386/conf/files.i386
sys/arch/i386/i386/identcpu.c
sys/arch/i386/i386/in_cksum.S
sys/arch/i386/i386/locore.S
sys/arch/i386/i386/machdep.c
sys/arch/i386/i386/mainbus.c
sys/arch/i386/i386/multiboot.c
sys/arch/i386/i386/powernow_k7.c
sys/arch/i386/i386/syscall.c
sys/arch/i386/i386/tsc.c
sys/arch/i386/include/Makefile
sys/arch/i386/include/clock.h
sys/arch/i386/include/cpu.h
sys/arch/i386/include/cpu_counter.h
sys/arch/i386/include/multiboot.h
sys/arch/i386/include/pmap.h
sys/arch/i386/include/profile.h
sys/arch/i386/include/userret.h
sys/arch/i386/include/vm86.h
sys/arch/i386/pci/i82802reg.h
sys/arch/i386/pci/pchb.c
sys/arch/i386/pci/pchb_rnd.c
sys/arch/i386/pci/pchbvar.h
sys/arch/i386/pci/pci_intr_fixup.c
sys/arch/i386/pci/pcib.c
sys/arch/ibmnws/conf/GENERIC
sys/arch/ibmnws/include/intr.h
sys/arch/ibmnws/include/kgdb.h
sys/arch/ibmnws/pci/pci_machdep.c
sys/arch/iyonix/conf/GENERIC
sys/arch/iyonix/iyonix/iyonix_pci.c
sys/arch/luna68k/conf/GENERIC
sys/arch/luna68k/include/bus.h
sys/arch/m68k/include/cacheops_20.h
sys/arch/m68k/include/cacheops_30.h
sys/arch/m68k/include/cacheops_40.h
sys/arch/m68k/include/cacheops_60.h
sys/arch/m68k/include/pmap_motorola.h
sys/arch/m68k/include/profile.h
sys/arch/m68k/include/psl.h
sys/arch/mac68k/conf/GENERIC
sys/arch/mac68k/conf/GENERICSBC
sys/arch/mac68k/conf/INSTALL
sys/arch/mac68k/conf/INSTALLSBC
sys/arch/mac68k/conf/SMALLRAM
sys/arch/mac68k/include/bus.h
sys/arch/macppc/conf/GENERIC
sys/arch/macppc/conf/POWERMAC
sys/arch/macppc/conf/files.macppc
sys/arch/macppc/dev/ofb.c
sys/arch/macppc/dev/ofbvar.h
sys/arch/macppc/dev/pbms.c
sys/arch/macppc/include/bus.h
sys/arch/mips/alchemy/au1000.c
sys/arch/mips/alchemy/au1100.c
sys/arch/mips/alchemy/au1500.c
sys/arch/mips/alchemy/au1550.c
sys/arch/mips/alchemy/au_chipdep.c
sys/arch/mips/alchemy/au_cpureg_mem.c
sys/arch/mips/alchemy/au_himem_space.c
sys/arch/mips/alchemy/au_icu.c
sys/arch/mips/alchemy/au_wired_space.c
sys/arch/mips/alchemy/aubus.c
sys/arch/mips/alchemy/dev/ac97reg.h
sys/arch/mips/alchemy/dev/aucom_aubus.c
sys/arch/mips/alchemy/dev/aucomreg.h
sys/arch/mips/alchemy/dev/augpio.c
sys/arch/mips/alchemy/dev/augpioreg.h
sys/arch/mips/alchemy/dev/augpiovar.h
sys/arch/mips/alchemy/dev/aupci.c
sys/arch/mips/alchemy/dev/aupcireg.h
sys/arch/mips/alchemy/dev/aupcivar.h
sys/arch/mips/alchemy/dev/if_aumac.c
sys/arch/mips/alchemy/dev/ohci_aubus.c
sys/arch/mips/alchemy/dev/ohcireg.h
sys/arch/mips/alchemy/dev/usbdreg.h
sys/arch/mips/alchemy/include/au_himem_space.h
sys/arch/mips/alchemy/include/au_wired_space.h
sys/arch/mips/alchemy/include/aureg.h
sys/arch/mips/alchemy/include/auvar.h
sys/arch/mips/conf/files.alchemy
sys/arch/mips/include/bus_space.h
sys/arch/mips/include/cpu_counter.h
sys/arch/mips/include/locore.h
sys/arch/mips/include/pmap.h
sys/arch/mips/include/pte.h
sys/arch/mips/include/userret.h
sys/arch/mips/mips/bus_space_alignstride_chipdep.c
sys/arch/mipsco/conf/GENERIC
sys/arch/mipsco/conf/INSTALL
sys/arch/mipsco/conf/RC3230
sys/arch/mipsco/include/bus.h
sys/arch/mmeye/conf/GENERIC
sys/arch/mmeye/conf/MMEYE
sys/arch/mmeye/conf/MMTA
sys/arch/mmeye/conf/MMTAICE
sys/arch/mmeye/conf/MMTAROMNEW
sys/arch/mvme68k/conf/GENERIC
sys/arch/mvme68k/conf/RAMDISK
sys/arch/mvme68k/conf/VME147
sys/arch/mvme68k/conf/VME162
sys/arch/mvme68k/conf/VME167
sys/arch/mvme68k/conf/VME172
sys/arch/mvme68k/conf/VME177
sys/arch/mvme68k/include/bus_space.h
sys/arch/mvme68k/include/intr.h
sys/arch/mvmeppc/conf/MVME1600
sys/arch/mvmeppc/include/intr.h
sys/arch/mvmeppc/include/kgdb.h
sys/arch/netwinder/conf/GENERIC
sys/arch/news68k/conf/GENERIC
sys/arch/news68k/conf/GENERIC_TINY
sys/arch/news68k/conf/INSTALL
sys/arch/news68k/conf/LIBERO
sys/arch/news68k/conf/NEWS1200
sys/arch/news68k/include/bus.h
sys/arch/news68k/include/cacheops_machdep.h
sys/arch/news68k/include/intr.h
sys/arch/newsmips/conf/DEJIKO
sys/arch/newsmips/conf/GENERIC
sys/arch/newsmips/conf/WAPIKO
sys/arch/newsmips/include/bus.h
sys/arch/next68k/conf/GENERIC
sys/arch/next68k/conf/SLAB
sys/arch/next68k/include/bus_space.h
sys/arch/ofppc/conf/BRIQ
sys/arch/ofppc/conf/GENERIC
sys/arch/pc532/conf/BULLBOX
sys/arch/pc532/conf/DUMMY
sys/arch/pc532/conf/GENERIC
sys/arch/pc532/conf/INSTALL
sys/arch/pc532/conf/KLONDIKE
sys/arch/pc532/conf/SALMON
sys/arch/pc532/conf/STEELHEAD
sys/arch/pc532/include/icu.h
sys/arch/pc532/include/intr.h
sys/arch/pc532/include/pmap.h
sys/arch/pc532/include/profile.h
sys/arch/pc532/pc532/db_disasm.c
sys/arch/pc532/pc532/db_memrw.c
sys/arch/pdp10/conf/GENERIC
sys/arch/playstation2/conf/AGATE
sys/arch/playstation2/conf/DEBUG
sys/arch/playstation2/conf/config.playstation2
sys/arch/playstation2/ee/gsfb.c
sys/arch/playstation2/include/bus.h
sys/arch/pmax/conf/GENERIC
sys/arch/pmax/conf/INSTALL
sys/arch/pmax/conf/WSCONS
sys/arch/pmax/include/bus.h
sys/arch/pmax/stand/common/start.S
sys/arch/pmppc/conf/INSTALL
sys/arch/pmppc/conf/PMPPC
sys/arch/pmppc/include/intr.h
sys/arch/pmppc/include/kgdb.h
sys/arch/powerpc/ibm4xx/dev/com_opb.c
sys/arch/powerpc/ibm4xx/dev/if_emac.c
sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
sys/arch/powerpc/ibm4xx/pci/pci_machdep.c
sys/arch/powerpc/include/cpu.h
sys/arch/powerpc/include/cpu_counter.h
sys/arch/powerpc/include/ipkdb.h
sys/arch/powerpc/include/openpic.h
sys/arch/powerpc/include/pio.h
sys/arch/powerpc/include/userret.h
sys/arch/prep/conf/GENERIC
sys/arch/prep/conf/NATSUMI
sys/arch/prep/include/intr.h
sys/arch/prep/include/kgdb.h
sys/arch/prep/pci/pci_machdep.c
sys/arch/sandpoint/conf/GENERIC.sandpoint
sys/arch/sandpoint/include/intr.h
sys/arch/sandpoint/include/kgdb.h
sys/arch/sbmips/conf/GENERIC
sys/arch/sgimips/conf/GENERIC32_IP2x
sys/arch/sgimips/conf/GENERIC32_IP3x
sys/arch/sgimips/include/bus.h
sys/arch/sgimips/include/param.h
sys/arch/sh3/include/Makefile
sys/arch/sh3/include/bswap.h
sys/arch/sh3/include/bus.h
sys/arch/sh3/include/byte_swap.h
sys/arch/sh3/include/pmap.h
sys/arch/sh3/include/scifreg.h
sys/arch/sh3/include/userret.h
sys/arch/sh3/sh3/exception_vector.S
sys/arch/sh3/sh3/mmu.c
sys/arch/sh3/sh3/pmap.c
sys/arch/sh5/include/bus.h
sys/arch/sh5/include/conreg.h
sys/arch/sh5/include/cpu.h
sys/arch/sh5/include/pmap.h
sys/arch/shark/conf/GENERIC
sys/arch/shark/conf/INSTALL
sys/arch/shark/conf/OFWGENCFG
sys/arch/sparc/conf/BILL-THE-CAT
sys/arch/sparc/conf/GENERIC
sys/arch/sparc/conf/INSTALL
sys/arch/sparc/conf/KRUPS
sys/arch/sparc/conf/MRCOFFEE
sys/arch/sparc/conf/TADPOLE3GX
sys/arch/sparc/include/bus.h
sys/arch/sparc/include/psl.h
sys/arch/sparc/include/pte.h
sys/arch/sparc/include/userret.h
sys/arch/sparc/include/vmparam.h
sys/arch/sparc/sparc/timer_msiiep.c
sys/arch/sparc64/conf/GENERIC32
sys/arch/sparc64/conf/NONPLUS
sys/arch/sparc64/conf/POWEROFSEVEN
sys/arch/sparc64/conf/POWEROFSEVEN.inc
sys/arch/sparc64/conf/SPLODE
sys/arch/sparc64/dev/auxio.c
sys/arch/sparc64/dev/com_ebus.c
sys/arch/sparc64/dev/cons.h
sys/arch/sparc64/dev/consinit.c
sys/arch/sparc64/dev/ebus.c
sys/arch/sparc64/dev/ffb.c
sys/arch/sparc64/dev/ffbvar.h
sys/arch/sparc64/dev/iommu.c
sys/arch/sparc64/dev/iommureg.h
sys/arch/sparc64/dev/iommuvar.h
sys/arch/sparc64/dev/kd.c
sys/arch/sparc64/dev/lpt_ebus.c
sys/arch/sparc64/dev/pci_machdep.c
sys/arch/sparc64/dev/pcons.c
sys/arch/sparc64/dev/psycho.c
sys/arch/sparc64/dev/psychoreg.h
sys/arch/sparc64/dev/psychovar.h
sys/arch/sparc64/dev/sab.c
sys/arch/sparc64/dev/sbus.c
sys/arch/sparc64/dev/sbusreg.h
sys/arch/sparc64/dev/zs.c
sys/arch/sparc64/include/bootinfo.h
sys/arch/sparc64/include/bus.h
sys/arch/sparc64/include/cpu.h
sys/arch/sparc64/include/cpu_counter.h
sys/arch/sparc64/include/ctlreg.h
sys/arch/sparc64/include/netbsd32_machdep.h
sys/arch/sparc64/include/pcb.h
sys/arch/sparc64/include/pci_machdep.h
sys/arch/sparc64/include/pmap.h
sys/arch/sparc64/include/psl.h
sys/arch/sparc64/include/pte.h
sys/arch/sparc64/include/sparc64.h
sys/arch/sparc64/include/svr4_32_machdep.h
sys/arch/sparc64/include/userret.h
sys/arch/sparc64/include/z8530var.h
sys/arch/sparc64/sparc64/autoconf.c
sys/arch/sparc64/sparc64/cache.h
sys/arch/sparc64/sparc64/clock.c
sys/arch/sparc64/sparc64/compat_16_machdep.c
sys/arch/sparc64/sparc64/cpu.c
sys/arch/sparc64/sparc64/db_interface.c
sys/arch/sparc64/sparc64/db_trace.c
sys/arch/sparc64/sparc64/emul.c
sys/arch/sparc64/sparc64/in4_cksum.c
sys/arch/sparc64/sparc64/intr.c
sys/arch/sparc64/sparc64/intreg.h
sys/arch/sparc64/sparc64/kgdb_machdep.c
sys/arch/sparc64/sparc64/kgdb_stub.c
sys/arch/sparc64/sparc64/locore.s
sys/arch/sparc64/sparc64/machdep.c
sys/arch/sparc64/sparc64/netbsd32_machdep.c
sys/arch/sparc64/sparc64/ofw_machdep.c
sys/arch/sparc64/sparc64/pmap.c
sys/arch/sparc64/sparc64/rbus_machdep.c
sys/arch/sparc64/sparc64/sunos32_machdep.c
sys/arch/sparc64/sparc64/sunos_machdep.c
sys/arch/sparc64/sparc64/svr4_32_machdep.c
sys/arch/sparc64/sparc64/svr4_machdep.c
sys/arch/sparc64/sparc64/sysioreg.h
sys/arch/sparc64/sparc64/trap.c
sys/arch/sparc64/sparc64/vm_machdep.c
sys/arch/sun2/conf/DISKLESS
sys/arch/sun2/conf/FOURMEG
sys/arch/sun2/conf/GENERIC
sys/arch/sun2/conf/INSTALL
sys/arch/sun2/conf/RAMDISK
sys/arch/sun2/conf/VME
sys/arch/sun2/include/pmap.h
sys/arch/sun3/conf/DISKLESS
sys/arch/sun3/conf/DISKLESS3X
sys/arch/sun3/conf/FOUR_TTYS
sys/arch/sun3/conf/GENERIC
sys/arch/sun3/conf/GENERIC3X
sys/arch/sun3/conf/INSTALL
sys/arch/sun3/conf/INSTALL3X
sys/arch/sun3/conf/KGDB
sys/arch/sun3/conf/KGDB3X
sys/arch/sun3/conf/RAMDISK
sys/arch/sun3/conf/RAMDISK3X
sys/arch/sun3/include/intr.h
sys/arch/sun3/include/pmap3.h
sys/arch/sun3/include/pmap3x.h
sys/arch/sun68k/include/bus.h
sys/arch/sun68k/include/intr.h
sys/arch/vax/conf/GENERIC
sys/arch/vax/conf/INSTALL
sys/arch/vax/include/bus.h
sys/arch/vax/include/byte_swap.h
sys/arch/vax/include/intr.h
sys/arch/vax/include/macros.h
sys/arch/vax/include/pmap.h
sys/arch/x68k/conf/GENERIC
sys/arch/x68k/conf/INSTALL
sys/arch/x68k/include/bus.h
sys/arch/x86/conf/files.x86
sys/arch/x86/include/bootinfo.h
sys/arch/x86/include/bus.h
sys/arch/x86/include/bus_private.h
sys/arch/x86/include/i82489var.h
sys/arch/x86/include/intr.h
sys/arch/x86/include/pio.h
sys/arch/x86/pci/i82802reg.h
sys/arch/x86/pci/pchb_rnd.c
sys/arch/x86/pci/pchbvar.h
sys/arch/x86/pci/pci_intr_machdep.c
sys/arch/x86/pci/pci_machdep.c
sys/arch/x86/x86/acpi_machdep.c
sys/arch/x86/x86/consinit.c
sys/arch/x86/x86/x86_autoconf.c
sys/arch/xen/conf/files.xen
sys/arch/xen/include/bus_private.h
sys/arch/xen/include/cpu.h
sys/arch/xen/include/hypervisor.h
sys/arch/xen/include/intr.h
sys/arch/xen/include/pmap.h
sys/arch/xen/include/xen.h
sys/arch/xen/include/xenfunc.h
sys/arch/xen/include/xenpmap.h
sys/arch/xen/xen/clock.c
sys/arch/xen/xen/if_xennet.c
sys/arch/xen/xen/xennetback.c
sys/compat/linux/arch/amd64/linux_commons.c
sys/compat/linux/arch/amd64/linux_syscall.h
sys/compat/linux/arch/amd64/linux_syscallargs.h
sys/compat/linux/arch/amd64/linux_syscalls.c
sys/compat/linux/arch/amd64/linux_sysent.c
sys/compat/linux/arch/amd64/syscalls.master
sys/compat/linux/common/linux_exec.h
sys/compat/linux/common/linux_exec_elf32.c
sys/compat/linux/common/linux_file64.c
sys/compat/linux/common/linux_ipc.c
sys/compat/linux/common/linux_ipccall.h
sys/compat/linux/common/linux_limit.h
sys/compat/linux/common/linux_misc.c
sys/compat/linux/common/linux_misc_notalpha.c
sys/compat/linux/common/linux_msg.h
sys/compat/linux/common/linux_oldmmap.c
sys/compat/linux/common/linux_sem.h
sys/compat/linux/common/linux_shm.h
sys/compat/linux/common/linux_socket.c
sys/compat/linux/common/linux_socketcall.h
sys/compat/linux/common/linux_termios.c
sys/compat/linux/common/linux_termios.h
sys/compat/linux32/Makefile.inc
sys/compat/linux32/arch/amd64/Makefile
sys/compat/linux32/arch/amd64/files.linux32_amd64
sys/compat/linux32/arch/amd64/linux32_errno.h
sys/compat/linux32/arch/amd64/linux32_exec.h
sys/compat/linux32/arch/amd64/linux32_ioctl.h
sys/compat/linux32/arch/amd64/linux32_machdep.c
sys/compat/linux32/arch/amd64/linux32_machdep.h
sys/compat/linux32/arch/amd64/linux32_missing.c
sys/compat/linux32/arch/amd64/linux32_missing.h
sys/compat/linux32/arch/amd64/linux32_signal.h
sys/compat/linux32/arch/amd64/linux32_syscall.h
sys/compat/linux32/arch/amd64/linux32_syscallargs.h
sys/compat/linux32/arch/amd64/linux32_syscalls.c
sys/compat/linux32/arch/amd64/linux32_sysent.c
sys/compat/linux32/arch/amd64/linux32_termios.h
sys/compat/linux32/arch/amd64/linux32_types.h
sys/compat/linux32/arch/amd64/syscalls.conf
sys/compat/linux32/arch/amd64/syscalls.master
sys/compat/linux32/common/linux32_dirent.c
sys/compat/linux32/common/linux32_emuldata.h
sys/compat/linux32/common/linux32_errno.h
sys/compat/linux32/common/linux32_exec.c
sys/compat/linux32/common/linux32_exec.h
sys/compat/linux32/common/linux32_exec_elf32.c
sys/compat/linux32/common/linux32_fcntl.c
sys/compat/linux32/common/linux32_ioctl.c
sys/compat/linux32/common/linux32_ioctl.h
sys/compat/linux32/common/linux32_machdep.h
sys/compat/linux32/common/linux32_misc.c
sys/compat/linux32/common/linux32_mman.c
sys/compat/linux32/common/linux32_resource.c
sys/compat/linux32/common/linux32_sched.c
sys/compat/linux32/common/linux32_signal.c
sys/compat/linux32/common/linux32_signal.h
sys/compat/linux32/common/linux32_socket.c
sys/compat/linux32/common/linux32_socketcall.c
sys/compat/linux32/common/linux32_socketcall.h
sys/compat/linux32/common/linux32_stat.c
sys/compat/linux32/common/linux32_sysctl.c
sys/compat/linux32/common/linux32_sysctl.h
sys/compat/linux32/common/linux32_termios.c
sys/compat/linux32/common/linux32_termios.h
sys/compat/linux32/common/linux32_time.c
sys/compat/linux32/common/linux32_types.h
sys/compat/linux32/common/linux32_unistd.c
sys/compat/linux32/common/linux32_utsname.c
sys/compat/linux32/common/linux32_wait.c
sys/compat/linux32/files.linux32
sys/compat/linux32/linux32_syscall.h
sys/compat/linux32/linux32_syscallargs.h
sys/compat/linux32/linux32_syscalls.c
sys/compat/mach/mach_message.h
sys/compat/netbsd32/netbsd32_conv.h
sys/compat/netbsd32/netbsd32_exec.h
sys/compat/netbsd32/netbsd32_netbsd.c
sys/compat/netbsd32/netbsd32_time.c
sys/conf/files
sys/dev/acpi/acpi.c
sys/dev/acpi/acpi_bat.c
sys/dev/acpi/acpi_button.c
sys/dev/acpi/acpi_ec.c
sys/dev/acpi/acpi_lid.c
sys/dev/acpi/acpi_madt.c
sys/dev/acpi/acpi_powerres.c
sys/dev/acpi/acpidevs
sys/dev/acpi/acpidevs_data.h
sys/dev/ata/atareg.h
sys/dev/audio_if.h
sys/dev/ccd.c
sys/dev/hpc/hpckbd.c
sys/dev/i2c/adm1030.c
sys/dev/i2c/adt7467.c
sys/dev/i2c/lm75.c
sys/dev/ic/aic79xx_inline.h
sys/dev/ic/aic79xx_osm.h
sys/dev/ic/aic79xxvar.h
sys/dev/ic/aic7xxx_inline.h
sys/dev/ic/aic7xxx_osm.h
sys/dev/ic/ath_netbsd.c
sys/dev/ic/ath_netbsd.h
sys/dev/ic/athrate-amrr.c
sys/dev/ic/athrate-amrr.h
sys/dev/ic/athrate-onoe.c
sys/dev/ic/athrate-onoe.h
sys/dev/ic/athrate-sample.c
sys/dev/ic/athrate-sample.h
sys/dev/ic/athrate.h
sys/dev/ic/cs89x0var.h
sys/dev/ic/dp83932var.h
sys/dev/ic/ds.h
sys/dev/ic/esiopvar.h
sys/dev/ic/i82365var.h
sys/dev/ic/i82801lpcreg.h
sys/dev/ic/iavcreg.h
sys/dev/ic/igsfbvar.h
sys/dev/ic/isp_netbsd.h
sys/dev/ic/mlxvar.h
sys/dev/ic/pcdisplayvar.h
sys/dev/ic/rtw.c
sys/dev/ic/rtwvar.h
sys/dev/ic/siopvar.h
sys/dev/ic/tcic2var.h
sys/dev/ic/tms320av110var.h
sys/dev/ic/vgavar.h
sys/dev/ieee1394/fw_port.h
sys/dev/ieee1394/fwdma.h
sys/dev/ir/sir.h
sys/dev/isapnp/isapnpvar.h
sys/dev/marvell/gtidmareg.h
sys/dev/marvell/gtpcivar.h
sys/dev/marvell/gtvar.h
sys/dev/mii/miidevs
sys/dev/mii/miidevs.h
sys/dev/mii/miidevs_data.h
sys/dev/mii/nsphyter.c
sys/dev/pci/cmdide.c
sys/dev/pci/if_bgereg.h
sys/dev/pci/if_devar.h
sys/dev/pci/if_lmc.c
sys/dev/pci/if_lmc.h
sys/dev/pci/if_sip.c
sys/dev/pci/if_sk.c
sys/dev/pci/if_skreg.h
sys/dev/pci/if_skvar.h
sys/dev/pci/if_tlp_pci.c
sys/dev/pci/if_wm.c
sys/dev/pci/if_wmvar.h
sys/dev/pci/mlyvar.h
sys/dev/pci/pciconf.c
sys/dev/pci/pciconf.h
sys/dev/pci/pcidevs
sys/dev/pci/pcidevs.h
sys/dev/pci/pcidevs_data.h
sys/dev/pci/pciide_opti_reg.h
sys/dev/pci/twevar.h
sys/dev/raidframe/rf_driver.c
sys/dev/raidframe/rf_psstatus.c
sys/dev/raidframe/rf_psstatus.h
sys/dev/rasops/rasops.c
sys/dev/rasops/rasops.h
sys/dev/rasops/rasops15.c
sys/dev/rasops/rasops32.c
sys/dev/rasops/rasops8.c
sys/dev/rnd.c
sys/dev/sbus/magmareg.h
sys/dev/scsipi/cd.c
sys/dev/scsipi/scsipi_base.h
sys/dev/scsipi/scsipiconf.h
sys/dev/usb/usbdevs
sys/dev/usb/usbdevs.h
sys/dev/usb/usbdevs_data.h
sys/dev/vnd.c
sys/dev/wscons/files.wscons
sys/dev/wscons/wsconsio.h
sys/dev/wscons/wsdisplay.c
sys/dev/wscons/wsdisplay_vcons.c
sys/dev/wscons/wsdisplay_vconsvar.h
sys/dev/wscons/wsevent.c
sys/dev/wscons/wseventvar.h
sys/dev/wscons/wskbd.c
sys/dev/wscons/wsmouse.c
sys/dev/wscons/wsmux.c
sys/dist/pf/net/pf.c
sys/fs/Makefile
sys/fs/cd9660/iso.h
sys/fs/tmpfs/tmpfs.h
sys/fs/tmpfs/tmpfs_pool.h
sys/fs/tmpfs/tmpfs_subr.c
sys/fs/tmpfs/tmpfs_vfsops.c
sys/fs/tmpfs/tmpfs_vnops.c
sys/fs/udf/Makefile
sys/fs/udf/ecma167-udf.h
sys/fs/udf/files.udf
sys/fs/udf/udf.h
sys/fs/udf/udf_bswap.h
sys/fs/udf/udf_mount.h
sys/fs/udf/udf_osta.c
sys/fs/udf/udf_osta.h
sys/fs/udf/udf_subr.c
sys/fs/udf/udf_subr.h
sys/fs/udf/udf_vfsops.c
sys/fs/udf/udf_vnops.c
sys/kern/exec_conf.c
sys/kern/exec_elf32.c
sys/kern/init_main.c
sys/kern/init_sysctl.c
sys/kern/kern_exec.c
sys/kern/kern_resource.c
sys/kern/kern_sig.c
sys/kern/kern_tc.c
sys/kern/subr_autoconf.c
sys/kern/subr_optstr.c
sys/kern/vfs_bio.c
sys/kern/vfs_lookup.c
sys/kern/vfs_subr.c
sys/kern/vfs_syscalls.c
sys/kern/vfs_vnops.c
sys/lib/libkern/arch/hppa/Makefile.inc
sys/lib/libkern/arch/sh3/byte_swap_2.S
sys/lib/libkern/libkern.h
sys/lib/libkern/softfloat.h
sys/lkm/arch/i386/powernow/lkminit_powernow.c
sys/lkm/dev/vnd/lkminit_vnd.c
sys/lkm/vfs/Makefile
sys/lkm/vfs/udf/Makefile
sys/lkm/vfs/udf/lkminit_vfs.c
sys/miscfs/procfs/procfs_vnops.c
sys/net/bpf_filter.c
sys/net/if_ecosubr.c
sys/net/if_tun.c
sys/net/pfil.h
sys/netinet/in.h
sys/netinet/ip_var.h
sys/netinet/tcp_input.c
sys/netinet/tcp_var.h
sys/netinet6/in6.c
sys/netinet6/in6.h
sys/netinet6/ipcomp_input.c
sys/netipsec/ipsec.h
sys/netipsec/ipsec_osdep.h
sys/netisdn/i4b_capi_msgs.h
sys/sys/bswap.h
sys/sys/bufq_impl.h
sys/sys/cdio.h
sys/sys/device.h
sys/sys/endian.h
sys/sys/fstypes.h
sys/sys/hash.h
sys/sys/lwp.h
sys/sys/mbuf.h
sys/sys/mount.h
sys/sys/namei.h
sys/sys/optstr.h
sys/sys/proc.h
sys/sys/resourcevar.h
sys/sys/select.h
sys/sys/spl.h
sys/sys/statvfs.h
sys/sys/sysctl.h
sys/sys/timepps.h
sys/sys/timetc.h
sys/sys/ucred.h
sys/sys/userret.h
sys/sys/vnode.h
sys/ufs/ext2fs/ext2fs.h
sys/ufs/ext2fs/ext2fs_dir.h
sys/uvm/Makefile
sys/uvm/uvm.h
sys/uvm/uvm_amap.c
sys/uvm/uvm_amap.h
sys/uvm/uvm_amap_i.h
sys/uvm/uvm_extern.h
sys/uvm/uvm_fault.c
sys/uvm/uvm_fault_i.h
sys/uvm/uvm_map.c
sys/uvm/uvm_map.h
sys/uvm/uvm_map_i.h
sys/uvm/uvm_page.c
sys/uvm/uvm_page.h
sys/uvm/uvm_page_i.h
sys/uvm/uvm_pager.c
sys/uvm/uvm_pager.h
sys/uvm/uvm_pager_i.h
sys/uvm/uvm_pdaemon.c
sys/uvm/uvm_stat.h
--- a/sys/altq/altq_var.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/altq/altq_var.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_var.h,v 1.7 2005/12/24 20:10:16 perry Exp $	*/
+/*	$NetBSD: altq_var.h,v 1.7.2.1 2006/02/18 15:38:30 yamt Exp $	*/
 /*	$KAME: altq_var.h,v 1.7 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -116,7 +116,7 @@
 
 #define	read_machclk()		rdtsc()
 #ifdef __OpenBSD__
-static inline u_int64_t
+static __inline u_int64_t
 rdtsc(void)
 {
 	u_int64_t rv;
@@ -132,7 +132,7 @@
 #else /* !i386 && !alpha */
 /* emulate 256MHz using microtime() */
 #define	MACHCLK_SHIFT	8
-static inline u_int64_t
+static __inline u_int64_t
 read_machclk(void)
 {
 	struct timeval tv;
--- a/sys/arch/acorn26/acorn26/cpuswitch.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/acorn26/cpuswitch.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuswitch.c,v 1.6 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: cpuswitch.c,v 1.6.2.1 2006/02/18 15:38:30 yamt Exp $	*/
 
 /*
  * Copyright (c) 2000 Ben Harris.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuswitch.c,v 1.6 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuswitch.c,v 1.6.2.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include "opt_lockdebug.h"
 
@@ -81,6 +81,9 @@
 
 /*
  * Find the highest-priority runnable process and switch to it.
+ *
+ * If l1 is NULL, we're switching away from a dying process.  We hope it's
+ * safe to run on its stack until the switch.
  */
 int
 cpu_switch(struct lwp *l1, struct lwp *newl)
@@ -89,6 +92,7 @@
 	struct prochd *q;
 	struct lwp *l2;
 	struct proc *p2;
+	struct switchframe *dummy;
 	/*
 	 * We enter here with interrupts blocked and sched_lock held.
 	 */
@@ -117,7 +121,8 @@
 #endif
 	if (l2 == l1)
 		return (0);
-	pmap_deactivate(l1);
+	if (l1 != NULL)
+		pmap_deactivate(l1);
 	pmap_activate(l2);
 
 	/* Check for Restartable Atomic Sequences. */
@@ -131,7 +136,8 @@
 			tf->tf_pc = (register_t) pc;
 	}
 
-	cpu_loswitch(&l1->l_addr->u_pcb.pcb_sf, l2->l_addr->u_pcb.pcb_sf);
+	cpu_loswitch(l1 ? &l1->l_addr->u_pcb.pcb_sf : &dummy,
+	    l2->l_addr->u_pcb.pcb_sf);
 	/* We only get back here after the other process has run. */
 	return (1);
 }
--- a/sys/arch/acorn26/acorn26/vm_machdep.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/acorn26/vm_machdep.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.9 2005/12/11 12:16:03 christos Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.9.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 Ben Harris
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.9 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.9.2.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -170,10 +170,18 @@
 {
 	int s;
 
-	/* I think this is safe on a uniprocessor machine */
+	/*
+	 * We're still running on l's stack here.  This is a little
+	 * dangerous, since we're about to free it, but no-one's going
+	 * to get a chance to reallocate it before we call
+	 * cpu_switch().  Well, I hope they're not anyway.
+	 *
+	 * A more conventional approach would be to run on lwp0's
+	 * stack or to have a special stack for this purpose.
+	 */
 	lwp_exit2(l);
 	SCHED_LOCK(s);		/* expected by cpu_switch */
-	cpu_switch(l, NULL);
+	cpu_switch(NULL, NULL);
 }
 
 void
--- a/sys/arch/acorn26/conf/FOURMEG	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/conf/FOURMEG	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.25 2005/12/07 12:40:46 tsutsui Exp $
+# $NetBSD: FOURMEG,v 1.25.2.1 2006/02/18 15:38:30 yamt Exp $
 
 # FOURMEG arm26 configuration -- something small
 
@@ -190,7 +190,7 @@
 arcvideo0	at root			# On-board video
 wsdisplay0	at arcvideo0
 
-#pseudo-device	bpfilter	16
+#pseudo-device	bpfilter
 #pseudo-device	ccd		4
 #pseudo-device	raid		4	# RAIDframe disk driver
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@@ -200,13 +200,13 @@
 pseudo-device	md		1
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_ROOT_SIZE=
-#pseudo-device	ppp		4
+#pseudo-device	ppp		
 pseudo-device	pty
-#pseudo-device	sl		4
-#pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+#pseudo-device	sl		
+#pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	wsmux			# keyboard/mouse multiplexor
 pseudo-device	clockctl		# user control of clock subsystem
--- a/sys/arch/acorn26/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.39 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.39.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -62,6 +62,7 @@
 file-system	FDESC		# /dev/fd
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	QUOTA		# UFS quotas
@@ -226,7 +227,7 @@
 arcvideo0	at root			# On-board video
 wsdisplay0	at arcvideo0
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		4
 #pseudo-device	cgd		4	# cryptographic disk devices
 pseudo-device	raid		8	# RAIDframe disk driver
@@ -245,15 +246,15 @@
 pseudo-device	md		1
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_ROOT_SIZE=
-pseudo-device	ppp		4
+pseudo-device	ppp		
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	sl		4
-pseudo-device	vnd		4
+pseudo-device	sl		
+pseudo-device	vnd		
 #options 	VND_COMPRESSION		# compressed vnd(4)
-pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device	faith			# IPv[46] tcp relay translation i/f
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/acorn26/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.15 2005/12/07 12:40:46 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.15.2.1 2006/02/18 15:38:30 yamt Exp $
 
 # INSTALL configuration, used to generate installation media
 
@@ -193,7 +193,7 @@
 arcvideo0	at root			# On-board video
 wsdisplay0	at arcvideo0
 
-#pseudo-device	bpfilter	16
+#pseudo-device	bpfilter
 #pseudo-device	ccd		4
 #pseudo-device	raid		4	# RAIDframe disk driver
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@@ -203,13 +203,13 @@
 pseudo-device	md		1
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_ROOT_SIZE=
-#pseudo-device	ppp		4
+#pseudo-device	ppp		
 pseudo-device	pty
-#pseudo-device	sl		4
-#pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+#pseudo-device	sl		
+#pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	wsmux			# keyboard/mouse multiplexor
 
--- a/sys/arch/acorn26/include/pmap.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/include/pmap.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.5 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: pmap.h,v 1.5.2.1 2006/02/18 15:38:30 yamt Exp $ */
 /*-
  * Copyright (c) 1997, 1998 Ben Harris
  * All rights reserved.
@@ -54,7 +54,7 @@
 extern long _pmap_resident_count(pmap_t);
 extern long _pmap_wired_count(pmap_t);
 
-static inline void
+static __inline void
 pmap_remove_all(struct pmap *pmap)
 {
 	/* Nothing. */
--- a/sys/arch/acorn26/ioc/arcpp.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/ioc/arcpp.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arcpp.c,v 1.6 2002/10/23 09:10:26 jdolecek Exp $ */
+/* $NetBSD: arcpp.c,v 1.6.34.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -52,7 +52,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.6 2002/10/23 09:10:26 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.6.34.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include <sys/conf.h>
 #include <sys/device.h>
@@ -172,7 +172,7 @@
  * Wait until the printer's selected and not busy.
  */
 int
-arcppopen(dev_t dev, int flag, int mode, struct proc *p)
+arcppopen(dev_t dev, int flag, int mode, struct lwp *l)
 {
 	u_char flags = ARCPPFLAGS(dev);
 	struct arcpp_softc *sc;
@@ -227,7 +227,7 @@
  * Close the device, and free the local line buffer.
  */
 int
-arcppclose(dev_t dev, int flag, int mode, struct proc *p)
+arcppclose(dev_t dev, int flag, int mode, struct lwp *l)
 {
 	struct arcpp_softc *sc = device_lookup(&arcpp_cd, ARCPPUNIT(dev));
 
--- a/sys/arch/acorn26/ioc/if_eca.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn26/ioc/if_eca.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_eca.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $	*/
+/*	$NetBSD: if_eca.c,v 1.4.34.1 2006/02/18 15:38:30 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -29,7 +29,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.4.34.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include <sys/device.h>
 #include <sys/malloc.h>
@@ -325,7 +325,7 @@
 	 */
 
 	totlen = 0;
-	n = NULL;
+	m = n = NULL;
 	while (totlen < sc->sc_ec.ec_if.if_mtu + ECO_HDR_LEN) {
 		MGETHDR(m, flags, MT_DATA);
 		if (m == NULL)
--- a/sys/arch/acorn32/conf/EB7500ATX	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: EB7500ATX,v 1.22 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: EB7500ATX,v 1.22.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"EB7500ATX-$Revision: 1.22 $"
+#ident		"EB7500ATX-$Revision: 1.22.2.1 $"
 
 # estimated number of users
 maxusers	32
@@ -268,23 +268,23 @@
 #ds1687rtc*	at rsbus?
 
 pseudo-device	loop	1		# network loopback
-pseudo-device	bpfilter 8		# packet filter
-pseudo-device	sl	2		# CSLIP
-pseudo-device	ppp	2		# PPP
+pseudo-device	bpfilter		# packet filter
+pseudo-device	sl			# CSLIP
+pseudo-device	ppp			# PPP
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun	2		# network tunneling over tty
+pseudo-device	tun			# network tunneling over tty
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre	2		# generic L3 over IP tunnel
+#pseudo-device	gre			# generic L3 over IP tunnel
 #pseudo-device	ipfilter 1		# ip filter
-pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith	1		# IPv[46] tcp relay translation i/f
-#pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
-#pseudo-device	strip	4		# STarmode Radio IP (Metricon Ricochet)
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	strip			# STarmode Radio IP (Metricon Ricochet)
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	vnd	4		# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	cgd	4		# cryptographic disk devices
 pseudo-device	raid	8		# RAIDframe disk driver
--- a/sys/arch/acorn32/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn32/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.65 2005/12/20 05:35:27 thorpej Exp $
+# 	$NetBSD: GENERIC,v 1.65.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.65 $"
+#ident		"GENERIC-$Revision: 1.65.2.1 $"
 
 # estimated number of users
 maxusers	32
@@ -66,6 +66,7 @@
 file-system	UNION		# union file system
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	QUOTA		# UFS quotas
@@ -336,23 +337,23 @@
 ne*	at podulebus?			# NE2000 clone cards
 
 pseudo-device	loop	1		# network loopback
-pseudo-device	bpfilter 8		# packet filter
-pseudo-device	sl	2		# CSLIP
-pseudo-device	ppp	2		# PPP
+pseudo-device	bpfilter		# packet filter
+pseudo-device	sl			# CSLIP
+pseudo-device	ppp			# PPP
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun	2		# network tunneling over tty
+pseudo-device	tun			# network tunneling over tty
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre	2		# generic L3 over IP tunnel
+#pseudo-device	gre			# generic L3 over IP tunnel
 #pseudo-device	ipfilter 1		# ip filter
-pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith	1		# IPv[46] tcp relay translation i/f
-#pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
-#pseudo-device	strip	4		# STarmode Radio IP (Metricon Ricochet)
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	strip			# STarmode Radio IP (Metricon Ricochet)
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	vnd	4		# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	cgd	4		# cryptographic disk devices
--- a/sys/arch/acorn32/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn32/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.37 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: INSTALL,v 1.37.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -22,7 +22,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"INSTALL-$Revision: 1.37 $"
+#ident		"INSTALL-$Revision: 1.37.2.1 $"
 
 # estimated number of users
 maxusers	32
@@ -319,22 +319,22 @@
 ne*	at podulebus?			# NE2000 clone cards
 
 pseudo-device	loop	1		# network loopback
-#pseudo-device	bpfilter 8		# packet filter
-#pseudo-device	sl	2		# CSLIP
-#pseudo-device	ppp	2		# PPP
+#pseudo-device	bpfilter		# packet filter
+#pseudo-device	sl			# CSLIP
+#pseudo-device	ppp			# PPP
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	tun	2		# network tunneling over tty
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre	2		# generic L3 over IP tunnel
+#pseudo-device	gre			# generic L3 over IP tunnel
 #pseudo-device	ipfilter 1		# ip filter
-#pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith	1		# IPv[46] tcp relay translation i/f
-#pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
-#pseudo-device	strip	4		# STarmode Radio IP (Metricon Ricochet)
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	strip			# STarmode Radio IP (Metricon Ricochet)
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	vnd	4		# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	raid	8		# RAIDframe disk driver
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: LOWMEM_WSCONS,v 1.38 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: LOWMEM_WSCONS,v 1.38.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -294,14 +294,14 @@
 #ne*	at podulebus?			# NE2000 clone cards
 
 pseudo-device	loop	1		# network loopback
-#pseudo-device	bpfilter 8		# packet filter
-#pseudo-device	sl	2		# CSLIP
-pseudo-device	ppp	2		# PPP
-#pseudo-device	tun	2		# network tunneling over tty
+#pseudo-device	bpfilter		# packet filter
+#pseudo-device	sl			# CSLIP
+pseudo-device	ppp			# PPP
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	ipfilter 1		# ip filter
-#pseudo-device	strip	4		# STRIP
+#pseudo-device	strip			# STRIP
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	vnd	4		# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
 pseudo-device	md	1		# Ramdisk driver
--- a/sys/arch/acorn32/conf/NC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn32/conf/NC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.37 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: NC,v 1.37.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	NC - with vidcconsole
 #
@@ -258,14 +258,14 @@
 ne*	at podulebus?			# NE2000 clone cards
 
 pseudo-device	loop	1		# network loopback
-#pseudo-device	bpfilter 8		# packet filter
-#pseudo-device	sl	2		# CSLIP
-#pseudo-device	ppp	2		# PPP
-#pseudo-device	tun	2		# network tunneling over tty
+#pseudo-device	bpfilter		# packet filter
+#pseudo-device	sl			# CSLIP
+#pseudo-device	ppp			# PPP
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	ipfilter 1		# ip filter
-#pseudo-device	strip	4		# STRIP
+#pseudo-device	strip			# STRIP
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	vnd	4		# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
 pseudo-device	md	1		# Ramdisk driver
--- a/sys/arch/acorn32/conf/NC_WSCONS	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn32/conf/NC_WSCONS	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NC_WSCONS,v 1.43 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: NC_WSCONS,v 1.43.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	NC - with wscons
 #
@@ -293,14 +293,14 @@
 ne*	at podulebus?			# NE2000 clone cards
 
 pseudo-device	loop	1		# network loopback
-#pseudo-device	bpfilter 8		# packet filter
-#pseudo-device	sl	2		# CSLIP
-#pseudo-device	ppp	2		# PPP
-#pseudo-device	tun	2		# network tunneling over tty
+#pseudo-device	bpfilter		# packet filter
+#pseudo-device	sl			# CSLIP
+#pseudo-device	ppp			# PPP
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	ipfilter 1		# ip filter
-#pseudo-device	strip	4		# STRIP
+#pseudo-device	strip			# STRIP
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	vnd	4		# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
 pseudo-device	md	1		# Ramdisk driver
--- a/sys/arch/acorn32/conf/RPC_WSCONS	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/acorn32/conf/RPC_WSCONS	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: RPC_WSCONS,v 1.43 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: RPC_WSCONS,v 1.43.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	RPC_WSCONS -- Full RiscPC config with wscons
 #
@@ -22,7 +22,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.43 $"
+#ident		"GENERIC-$Revision: 1.43.2.1 $"
 
 # estimated number of users
 maxusers	32
@@ -313,22 +313,22 @@
 ne*	at podulebus?			# NE2000 clone cards
 
 pseudo-device	loop	1		# network loopback
-pseudo-device	bpfilter 8		# packet filter
-pseudo-device	sl	2		# CSLIP
-pseudo-device	ppp	2		# PPP
+pseudo-device	bpfilter		# packet filter
+pseudo-device	sl			# CSLIP
+pseudo-device	ppp			# PPP
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun	2		# network tunneling over tty
+pseudo-device	tun			# network tunneling over tty
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre	2		# generic L3 over IP tunnel
+#pseudo-device	gre			# generic L3 over IP tunnel
 #pseudo-device	ipfilter 1		# ip filter
-pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith	1		# IPv[46] tcp relay translation i/f
-#pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
-#pseudo-device	strip	4		# STarmode Radio IP (Metricon Ricochet)
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	strip			# STarmode Radio IP (Metricon Ricochet)
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	vnd	4		# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 pseudo-device	ccd	2		# concatenated disk devices
 pseudo-device	raid	8		# RAIDframe disk driver
 options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
--- a/sys/arch/algor/algor/autoconf.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/algor/algor/autoconf.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.6 2005/12/11 12:16:08 christos Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.6.2.1 2006/02/18 15:38:30 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2005/12/11 12:16:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6.2.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -53,6 +53,10 @@
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
+#ifdef ALGOR_P4032
+#include <algor/algor/algor_p4032var.h>
+#endif
+
 void
 cpu_configure(void)
 {
@@ -72,6 +76,19 @@
 	setroot(booted_device, booted_partition);
 }
 
+#if defined(ALGOR_P4032)
+#define	BUILTIN_ETHERNET_P(pa)						\
+	((pa)->pa_bus == 0 && (pa)->pa_device == 5 && (pa)->pa_function == 0)
+#elif defined(ALGOR_P5064)
+#define	BUILTIN_ETHERNET_P(pa)						\
+	((pa)->pa_bus == 0 && (pa)->pa_device == 0 && (pa)->pa_function == 0)
+#elif defined(ALGOR_P6032)
+#define	BUILTIN_ETHERNET_P(pa)						\
+	((pa)->pa_bus == 0 && (pa)->pa_device == 16 && (pa)->pa_function == 0)
+#else
+#define	BUILTIN_ETHERNET_P(pa)	0
+#endif
+
 void
 device_register(struct device *dev, void *aux)
 {
@@ -80,4 +97,33 @@
 	 * We don't ever know the boot device.  But that's because the
 	 * firmware only loads from the network or the parallel port.
 	 */
+
+	/*
+	 * Fetch the MAC address for the built-in Ethernet (we grab it
+	 * from PMON earlier in the boot process).
+	 */
+	if (dev->dev_parent != NULL &&
+	    strcmp(dev->dv_parent->dv_cfdata->cf_name, "pci") == 0) {
+		struct pci_attach_args *pa = aux;
+
+		if (BUILTIN_ETHERNET_P(pa)) {
+			if (devprop_set(dev, "mac-addr",
+				     algor_ethaddr,
+				     sizeof(algor_ethaddr), 0, 0) != 0) {
+				printf("WARNING: unable to set mac-addr "
+				    "property for %s\n", dev->dv_xname);
+			}
+#if defined(ALGOR_P4032)
+			/*
+			 * XXX This is gross, disgusting, and otherwise vile,
+			 * XXX but V962 rev. < B2 have broken DMA FIFOs.  Give
+			 * XXX the on-board Ethernet a different DMA window
+			 * XXX that has pre-fetching disabled so that Ethernet
+			 * XXX performance doesn't completely suck.
+			 */
+			pa->pa_dmat = &p4032_configuration.ac_pci_pf_dmat;
+			pa->pa_dmat64 = NULL;
+#endif /* ALGOR_P4032 */
+		}
+	}
 }
--- a/sys/arch/algor/algor/machdep.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/algor/algor/machdep.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.29 2005/12/24 20:06:46 perry Exp $	*/
+/*	$NetBSD: machdep.c,v 1.29.2.1 2006/02/18 15:38:30 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2005/12/24 20:06:46 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29.2.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h" 
@@ -747,38 +747,3 @@
 	for (;;)
 		/* spin forever */ ;
 }
-
-/*
- * XXX This shouldn't be here -- it should be done w/ devprops,
- * XXX but we don't have those yet.
- */
-int
-algor_get_ethaddr(struct pci_attach_args *pa, u_int8_t *buf)
-{
-
-#if defined(ALGOR_P4032)
-	if (pa->pa_bus != 0 || pa->pa_device != 5 || pa->pa_function != 0)
-		return (0);
-#elif defined(ALGOR_P5064)
-	if (pa->pa_bus != 0 || pa->pa_device != 0 || pa->pa_function != 0)
-		return (0);
-#elif defined(ALGOR_P6032)
-	if (pa->pa_bus != 0 || pa->pa_device != 16 || pa->pa_function != 0)
-		return (0);
-#endif
-
-	if (buf != NULL)
-		memcpy(buf, algor_ethaddr, sizeof(algor_ethaddr));
-#if defined(ALGOR_P4032)
-	/*
-	 * XXX This is gross, disgusting, and otherwise vile, but
-	 * XXX V962 rev. < B2 have broken DMA FIFOs.  Give the
-	 * XXX on-board Ethernet a different DMA window that
-	 * XXX has pre-fetching enabled so that Ethernet performance
-	 * XXX doesn't completely suck.
-	 */
-	pa->pa_dmat = &p4032_configuration.ac_pci_pf_dmat;
-	pa->pa_dmat64 = NULL;
-#endif
-	return (1);
-}
--- a/sys/arch/algor/conf/P4032	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/algor/conf/P4032	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: P4032,v 1.38 2005/12/07 09:10:11 tsutsui Exp $
+#	$NetBSD: P4032,v 1.38.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # Algorithmics P-4032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P4032-$Revision: 1.38 $"
+#ident 		"P4032-$Revision: 1.38.2.1 $"
 
 maxusers 32
 
@@ -307,7 +307,7 @@
 #wskbd*		at	pckbd?
 #wsmouse*	at	pms?
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		4
 #pseudo-device	cgd		4	# cryptographic disk devices
 #pseudo-device	raid		4		# RAIDframe disk driver
@@ -316,14 +316,14 @@
 pseudo-device	ipfilter	1
 pseudo-device	loop		1
 pseudo-device	md		1
-pseudo-device	ppp		4
+pseudo-device	ppp		
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	sl		4
-pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	sl		
+pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
--- a/sys/arch/algor/conf/P5064	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/algor/conf/P5064	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: P5064,v 1.44 2005/12/07 09:10:11 tsutsui Exp $
+#	$NetBSD: P5064,v 1.44.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P5064-$Revision: 1.44 $"
+#ident 		"P5064-$Revision: 1.44.2.1 $"
 
 maxusers 32
 
@@ -371,7 +371,7 @@
 #wskbd*		at	pckbd?
 #wsmouse*	at	pms?
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		4
 #pseudo-device	cgd		4	# cryptographic disk devices
 #pseudo-device	raid		4		# RAIDframe disk driver
@@ -380,14 +380,14 @@
 pseudo-device	ipfilter	1
 pseudo-device	loop		1
 pseudo-device	md		1
-pseudo-device	ppp		4
+pseudo-device	ppp		
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	sl		4
-pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	sl		
+pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
--- a/sys/arch/algor/conf/P6032	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/algor/conf/P6032	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: P6032,v 1.38 2005/12/07 09:10:11 tsutsui Exp $
+#	$NetBSD: P6032,v 1.38.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P6032-$Revision: 1.38 $"
+#ident 		"P6032-$Revision: 1.38.2.1 $"
 
 maxusers 32
 
@@ -376,7 +376,7 @@
 #wskbd*		at	pckbd?
 #wsmouse*	at	pms?
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		4
 #pseudo-device	cgd		4	# cryptographic disk devices
 #pseudo-device	raid		4		# RAIDframe disk driver
@@ -385,14 +385,14 @@
 pseudo-device	ipfilter	1
 pseudo-device	loop		1
 pseudo-device	md		1
-pseudo-device	ppp		4
+pseudo-device	ppp		
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	sl		4
-pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	sl		
+pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
--- a/sys/arch/algor/include/pci_machdep.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/algor/include/pci_machdep.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.h,v 1.6 2005/12/11 12:16:08 christos Exp $	*/
+/*	$NetBSD: pci_machdep.h,v 1.6.2.1 2006/02/18 15:38:30 yamt Exp $	*/
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -113,5 +113,3 @@
     ((c)->pc_pciide_compat_intr_establish == NULL ? NULL :		\
      (*(c)->pc_pciide_compat_intr_establish)((c)->pc_conf_v, (d), (p),	\
 	(ch), (f), (a)))
-
-int	algor_get_ethaddr(struct pci_attach_args *, u_int8_t *);
--- a/sys/arch/alpha/conf/ALPHA	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/conf/ALPHA	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALPHA,v 1.213 2005/12/07 09:10:11 tsutsui Exp $
+# $NetBSD: ALPHA,v 1.213.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
@@ -6,7 +6,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"ALPHA-$Revision: 1.213 $"
+ident		"ALPHA-$Revision: 1.213.2.1 $"
 
 maxusers 32
 
@@ -578,7 +578,7 @@
 wskbd*		at	pckbd?
 wsmouse*	at	pms?
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		4
 pseudo-device	cgd		4	# cryptographic disk devices
 pseudo-device	raid		8	# RAIDframe disk driver
@@ -595,18 +595,18 @@
 pseudo-device	ipfilter	1
 pseudo-device	loop		1
 pseudo-device	md		1
-pseudo-device	ppp		4
+pseudo-device	ppp		
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	sl		4
-pseudo-device	strip		4
-pseudo-device	tun		4
+pseudo-device	sl		
+pseudo-device	strip		
+pseudo-device	tun		
 pseudo-device	tap			# virtual Ethernet
-pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/alpha/conf/BASIL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/conf/BASIL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BASIL,v 1.42 2005/12/07 09:10:11 tsutsui Exp $
+# $NetBSD: BASIL,v 1.42.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # basil.shagadelic.org -- thorpej's API UP1000
 
@@ -6,7 +6,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"BASIL-$Revision: 1.42 $"
+#ident 		"BASIL-$Revision: 1.42.2.1 $"
 
 maxusers 64
 
@@ -459,7 +459,7 @@
 wskbd*		at	pckbd?
 wsmouse*	at	pms?
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 #pseudo-device	ccd		4
 #pseudo-device	raid		4	# RAIDframe disk driver
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@@ -467,14 +467,14 @@
 #pseudo-device	ipfilter	1
 pseudo-device	loop		1
 #pseudo-device	md		1
-#pseudo-device	ppp		4
+#pseudo-device	ppp		
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	sl		4
-pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	sl		
+pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness too
--- a/sys/arch/alpha/conf/FRAU-FARBISSINA	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/conf/FRAU-FARBISSINA	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FRAU-FARBISSINA,v 1.47 2005/12/07 09:10:11 tsutsui Exp $
+# $NetBSD: FRAU-FARBISSINA,v 1.47.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # frau-farbissina.shagadelic.org -- thorpej's AlphaServer 1200 MP hacking
 # box
@@ -7,7 +7,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"FRAU-FARBISSINA-$Revision: 1.47 $"
+#ident 		"FRAU-FARBISSINA-$Revision: 1.47.2.1 $"
 
 maxusers 64
 
@@ -428,7 +428,7 @@
 wskbd*		at	pckbd?
 wsmouse*	at	pms?
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		4
 pseudo-device	raid		4	# RAIDframe disk driver
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@@ -436,14 +436,14 @@
 #pseudo-device	ipfilter	1
 pseudo-device	loop		1
 #pseudo-device	md		1
-#pseudo-device	ppp		4
+#pseudo-device	ppp		
 pseudo-device	pty
-#pseudo-device	sl		4
-pseudo-device	vnd		4
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	sl		
+pseudo-device	vnd		
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	clockctl		# user control of clock subsystem
 
--- a/sys/arch/alpha/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.282 $"
+#ident 		"GENERIC-$Revision: 1.282.2.1 $"
 
 maxusers 32
 
@@ -80,6 +80,7 @@
 file-system	PROCFS		# Process file system (/proc)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	QUOTA		# UFS quotas
@@ -614,7 +615,7 @@
 pseudo-device 	crypto			# /dev/crypto device
 pseudo-device	swcrypto		# software crypto implementation
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		4
 #pseudo-device	cgd		4	# cryptographic disk devices
 pseudo-device	raid		8	# RAIDframe disk driver
@@ -631,16 +632,16 @@
 pseudo-device	ipfilter	1
 pseudo-device	loop		1
 pseudo-device	md		1
-pseudo-device	ppp		4
+pseudo-device	ppp		
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	sl		4
-pseudo-device	vnd		4
+pseudo-device	sl		
+pseudo-device	vnd		
 #options 	VND_COMPRESSION		# compressed vnd(4)
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/alpha/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.88 2005/12/07 12:40:46 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.88.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -335,9 +335,9 @@
 
 pseudo-device	loop		1
 pseudo-device	md		1
-pseudo-device	ppp		1
+pseudo-device	ppp		
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
-pseudo-device	sl		1
+pseudo-device	sl		
 
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #pseudo-device	fss		4	# file system snapshot device
--- a/sys/arch/alpha/conf/RAWHIDE	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/conf/RAWHIDE	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.27 2005/12/07 09:10:12 tsutsui Exp $
+# $NetBSD: RAWHIDE,v 1.27.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # Alpha 4100 stripped for action server kernel.
 #
@@ -98,14 +98,14 @@
 st*	at	scsibus? target ? lun ?
 ch*	at	scsibus? target ? lun ?
 
-pseudo-device	bpfilter	16
+pseudo-device	bpfilter
 pseudo-device	ccd		16
 pseudo-device	ipfilter	1
 pseudo-device	loop		1
 pseudo-device	md		1
-pseudo-device	ppp		4
+pseudo-device	ppp		
 pseudo-device	pty
-pseudo-device	sl		4
-pseudo-device	vnd		4
+pseudo-device	sl		
+pseudo-device	vnd		
 pseudo-device	clockctl		# user control of clock subsystem
 #pseudo-device	fss		4	# file system snapshot device
--- a/sys/arch/alpha/include/alpha_cpu.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/include/alpha_cpu.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_cpu.h,v 1.47 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: alpha_cpu.h,v 1.47.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -335,7 +335,7 @@
 
 /* XXX Expose the insn wrappers to userspace, for now. */
 
-static inline unsigned long
+static __inline unsigned long
 alpha_rpcc(void)
 {
 	unsigned long v0;
@@ -366,7 +366,7 @@
 #define	alpha_pal_imb()	__asm volatile("call_pal %0 # PAL_imb"	\
 				: : "i" (PAL_imb) : "memory")
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_rdmces(void)
 {
 	register unsigned long v0 __asm("$0");
@@ -380,7 +380,7 @@
 	return (v0);
 }
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_rdps(void)
 {
 	register unsigned long v0 __asm("$0");
@@ -394,7 +394,7 @@
 	return (v0);
 }
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_rdunique(void)
 {
 	register unsigned long v0 __asm("$0");
@@ -406,7 +406,7 @@
 	return (v0);
 }
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_rdusp(void)
 {
 	register unsigned long v0 __asm("$0");
@@ -420,7 +420,7 @@
 	return (v0);
 }
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_rdval(void)
 {
 	register unsigned long v0 __asm("$0");
@@ -434,7 +434,7 @@
 	return (v0);
 }
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_swpctx(unsigned long ctx)
 {
 	register unsigned long a0 __asm("$16") = ctx;
@@ -449,7 +449,7 @@
 	return (v0);
 }
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_swpipl(unsigned long ipl)
 {
 	register unsigned long a0 __asm("$16") = ipl;
@@ -464,7 +464,7 @@
 	return (v0);
 }
 
-static inline void
+static __inline void
 alpha_pal_tbi(unsigned long op, vaddr_t va)
 {
 	register unsigned long a0 __asm("$16") = op;
@@ -477,7 +477,7 @@
 		: "$1", "$22", "$23", "$24", "$25");
 }
 
-static inline unsigned long
+static __inline unsigned long
 alpha_pal_whami(void)
 {
 	register unsigned long v0 __asm("$0");
@@ -491,7 +491,7 @@
 	return (v0);
 }
 
-static inline void
+static __inline void
 alpha_pal_wrfen(unsigned long onoff)
 {
 	register unsigned long a0 __asm("$16") = onoff;
@@ -503,7 +503,7 @@
 		: "$1", "$22", "$23", "$24", "$25");
 }
 
-static inline void
+static __inline void
 alpha_pal_wripir(unsigned long cpu_id)
 {
 	register unsigned long a0 __asm("$16") = cpu_id;
@@ -515,7 +515,7 @@
 		: "$1", "$22", "$23", "$24", "$25");
 }
 
-static inline void
+static __inline void
 alpha_pal_wrunique(unsigned long unique)
 {
 	register unsigned long a0 __asm("$16") = unique;
@@ -525,7 +525,7 @@
 		: "i" (PAL_wrunique), "0" (a0));
 }
 
-static inline void
+static __inline void
 alpha_pal_wrusp(unsigned long usp)
 {
 	register unsigned long a0 __asm("$16") = usp;
@@ -537,7 +537,7 @@
 		: "$1", "$22", "$23", "$24", "$25");
 }
 
-static inline void
+static __inline void
 alpha_pal_wrmces(unsigned long mces)
 {
 	register unsigned long a0 __asm("$16") = mces;
@@ -549,7 +549,7 @@
 		: "$1", "$22", "$23", "$24", "$25");
 }
 
-static inline void
+static __inline void
 alpha_pal_wrval(unsigned long val)
 {
 	register unsigned long a0 __asm("$16") = val;
--- a/sys/arch/alpha/include/bwx.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/include/bwx.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bwx.h,v 1.4 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: bwx.h,v 1.4.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  * See "Alpha Architecture Handbook, Version 3", DEC order number EC-QD2KB-TE.
  */
 
-static inline u_int8_t
+static __inline u_int8_t
 alpha_ldbu(volatile u_int8_t *a0)
 {
 	u_int8_t v0;
@@ -60,7 +60,7 @@
 	return (v0);
 }
 
-static inline u_int16_t
+static __inline u_int16_t
 alpha_ldwu(volatile u_int16_t *a0)
 {
 	u_int16_t v0;
@@ -72,7 +72,7 @@
 	return (v0);
 }
 
-static inline void
+static __inline void
 alpha_stb(volatile u_int8_t *a0, u_int8_t a1)
 {
 
@@ -81,7 +81,7 @@
 		: "r" (a1));
 }
 
-static inline void
+static __inline void
 alpha_stw(volatile u_int16_t *a0, u_int16_t a1)
 {
 
@@ -90,7 +90,7 @@
 		: "r" (a1));
 }
 
-static inline u_int8_t
+static __inline u_int8_t
 alpha_sextb(u_int8_t a0)
 {
 	u_int8_t v0;
@@ -102,7 +102,7 @@
 	return (v0);
 }
 
-static inline u_int16_t
+static __inline u_int16_t
 alpha_sextw(u_int16_t a0)
 {
 	u_int16_t v0;
--- a/sys/arch/alpha/include/cpu_counter.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/include/cpu_counter.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_counter.h,v 1.2 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: cpu_counter.h,v 1.2.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
 #define cpu_hascounter()	(1)
 #define cpu_counter()		cpu_counter32()
 
-static inline uint32_t
+static __inline uint32_t
 cpu_counter32(void)
 {
 
@@ -64,7 +64,7 @@
 	return (alpha_rpcc() & 0xffffffffU);
 }
 
-static inline uint64_t
+static __inline uint64_t
 cpu_frequency(struct cpu_info *ci)
 {
 
--- a/sys/arch/alpha/include/intr.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/include/intr.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.54 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: intr.h,v 1.54.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -160,7 +160,7 @@
 /* IPL-lowering/restoring macros */
 void	spl0(void);
 
-static inline void
+static __inline void
 splx(int s)
 {
 	if (s == ALPHA_PSL_IPL_0 && ssir != 0)
@@ -171,7 +171,7 @@
 #define	spllowersoftclock()	((void)alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT))
 
 /* IPL-raising functions/macros */
-static inline int
+static __inline int
 _splraise(int s)
 {
 	int cur = alpha_pal_rdps() & ALPHA_PSL_IPL_MASK;
--- a/sys/arch/alpha/include/pmap.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/include/pmap.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.65 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: pmap.h,v 1.65.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -225,7 +225,7 @@
 #define	pmap_copy(dp, sp, da, l, sa)	/* nothing */
 #define	pmap_update(pmap)		/* nothing (yet) */
 
-static inline void
+static __inline void
 pmap_remove_all(struct pmap *pmap)
 {
 	/* Nothing. */
@@ -290,13 +290,13 @@
 
 #define	pmap_pte_prot_chg(pte, np) ((np) ^ pmap_pte_prot(pte))
 
-static inline pt_entry_t *pmap_l2pte(pmap_t, vaddr_t, pt_entry_t *);
-static inline pt_entry_t *pmap_l3pte(pmap_t, vaddr_t, pt_entry_t *);
+static __inline pt_entry_t *pmap_l2pte(pmap_t, vaddr_t, pt_entry_t *);
+static __inline pt_entry_t *pmap_l3pte(pmap_t, vaddr_t, pt_entry_t *);
 
 #define	pmap_l1pte(pmap, v)						\
 	(&(pmap)->pm_lev1map[l1pte_index((vaddr_t)(v))])
 
-static inline pt_entry_t *
+static __inline pt_entry_t *
 pmap_l2pte(pmap, v, l1pte)
 	pmap_t pmap;
 	vaddr_t v;
@@ -314,7 +314,7 @@
 	return (&lev2map[l2pte_index(v)]);
 }
 
-static inline pt_entry_t *
+static __inline pt_entry_t *
 pmap_l3pte(pmap, v, l2pte)
 	pmap_t pmap;
 	vaddr_t v;
--- a/sys/arch/alpha/include/userret.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/include/userret.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.5 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: userret.h,v 1.5.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
  * Define the code needed before returning to user mode, for
  * trap and syscall.
  */
-static inline void
+static __inline void
 userret(struct lwp *l)
 {
 	struct proc *p = l->l_proc;
--- a/sys/arch/alpha/pci/pci_6600.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/alpha/pci/pci_6600.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_6600.c,v 1.13 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: pci_6600.c,v 1.13.2.1 2006/02/18 15:38:30 yamt Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.13 2005/12/11 12:16:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.13.2.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -129,7 +129,7 @@
 			cp = alpha_shared_intr_string(dec_6600_pci_intr, i);
 			sprintf(cp, "irq %d", i);
 			evcnt_attach_dynamic(alpha_shared_intr_evcnt(
-			    dec_6600_pci_intr, 1), EVCNT_TYPE_INTR, NULL,
+			    dec_6600_pci_intr, i), EVCNT_TYPE_INTR, NULL,
 			    "dec_6600", cp);
 		}
 #if NSIO
--- a/sys/arch/amd64/amd64/genassym.cf	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.4 2005/12/11 12:16:21 christos Exp $
+#	$NetBSD: genassym.cf,v 1.4.2.1 2006/02/18 15:38:30 yamt Exp $
 
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,6 +76,7 @@
 
 if defined(_KERNEL_OPT)
 include "opt_compat_netbsd32.h"
+include "opt_compat_linux32.h"
 include "opt_multiprocessor.h"
 endif
 
@@ -102,6 +103,10 @@
 include <machine/netbsd32_machdep.h>
 endif
 
+if defined(COMPAT_LINUX32)
+include <machine/linux32_machdep.h>
+endif
+
 if defined(_KERNEL) && !defined(_LKM)
 include "isa.h"
 include "ioapic.h"
@@ -239,6 +244,16 @@
 define	SC_GS32			offsetof(struct netbsd32_sigcontext, sc_gs)
 endif
 
+ifdef COMPAT_LINUX32
+define  LINUX32_SF_HANDLER	offsetof(struct linux32_sigframe, sf_handler)
+define  LINUX32_SF_SC		offsetof(struct linux32_sigframe, sf_sc)
+define  LINUX32_RT_SF_HANDLER	offsetof(struct linux32_rt_sigframe, sf_handler)
+define  LINUX32_RT_SF_UC	offsetof(struct linux32_rt_sigframe, sf_uc)
+define  LINUX32_SYS_rt_sigreturn	LINUX32_SYS_rt_sigreturn
+define  LINUX32_SYS_sigreturn		LINUX32_SYS_sigreturn
+define  LINUX32_SYS_exit		LINUX32_SYS_exit
+endif
+
 define	IS_RECURSE	offsetof(struct intrsource, is_recurse)
 define	IS_RESUME	offsetof(struct intrsource, is_resume)
 define	IS_EVCNT	offsetof(struct intrsource, is_evcnt.ev_count)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/amd64/linux32_sigcode.S	Sat Feb 18 15:38:30 2006 +0000
@@ -0,0 +1,28 @@
+/*	$NetBSD: linux32_sigcode.S,v 1.1.2.2 2006/02/18 15:38:30 yamt Exp $ */
+
+#include "assym.h"
+#include <machine/asm.h>
+
+	.code32
+NENTRY(linux32_sigcode)
+	 call    *LINUX32_SF_HANDLER(%esp)
+	 leal    LINUX32_SF_SC(%esp),%ebx # scp
+	 pushl   %eax
+	 movl    $LINUX32_SYS_sigreturn,%eax
+	 int     $0x80
+	 movl    $LINUX32_SYS_exit,%eax
+	 int     $0x80
+  
+	.balign 16,,
+NENTRY(linux32_rt_sigcode)
+	 call    *LINUX32_RT_SF_HANDLER(%esp)
+	 leal    LINUX32_RT_SF_UC(%esp),%ebx # scp
+	 pushl   %eax
+	 movl    $LINUX32_SYS_rt_sigreturn,%eax
+	 int     $0x80
+	 movl    $LINUX32_SYS_exit,%eax
+	 int     $0x80
+	.balign 16,,
+	 .globl  _C_LABEL(linux32_esigcode)
+_C_LABEL(linux32_esigcode): 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/amd64/linux32_syscall.c	Sat Feb 18 15:38:30 2006 +0000
@@ -0,0 +1,307 @@
+/*	$NetBSD: linux32_syscall.c,v 1.1.2.2 2006/02/18 15:38:30 yamt Exp $ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscall.c,v 1.1.2.2 2006/02/18 15:38:30 yamt Exp $");
+
+#include "opt_syscall_debug.h"
+#include "opt_ktrace.h"
+#include "opt_systrace.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/sa.h>
+#include <sys/savar.h>
+#include <sys/signal.h>
+#ifdef KTRACE
+#include <sys/ktrace.h>
+#endif
+#ifdef SYSTRACE
+#include <sys/systrace.h>
+#endif
+#include <sys/syscall.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <machine/cpu.h>
+#include <machine/psl.h>
+#include <machine/userret.h>
+
+#include <compat/linux32/arch/amd64/linux32_errno.h>
+
+void linux32_syscall_intern(struct proc *);
+void linux32_syscall_plain(struct trapframe *);
+void linux32_syscall_fancy(struct trapframe *);
+
+void
+linux32_syscall_intern(p)
+	struct proc *p;
+{
+#ifdef KTRACE
+	if (p->p_traceflag & (KTRFAC_SYSCALL | KTRFAC_SYSRET)) {
+		p->p_md.md_syscall = linux32_syscall_fancy;
+		return;
+	}
+#endif
+#ifdef SYSTRACE
+	if (ISSET(p->p_flag, P_SYSTRACE)) {
+		p->p_md.md_syscall = linux32_syscall_fancy;
+		return;
+	} 
+#endif
+	p->p_md.md_syscall = linux32_syscall_plain;
+}
+
+void
+linux32_syscall_plain(frame)
+	struct trapframe *frame;
+{
+	caddr_t params;
+	const struct sysent *callp;
+	struct proc *p;
+	struct lwp *l;
+	int error;
+	size_t argsize;
+	register32_t code, args[8];
+	register_t rval[2];
+
+	uvmexp.syscalls++;
+	l = curlwp;
+	p = l->l_proc;
+
+	code = frame->tf_rax;
+	callp = p->p_emul->e_sysent;
+	params = (caddr_t)frame->tf_rsp + sizeof(int);
+
+	switch (code) {
+	case SYS_syscall:
+		/*
+		 * Code is first argument, followed by actual args.
+		 */
+		code = fuword(params);
+		params += sizeof(int);
+		break;
+	case SYS___syscall:
+		/*
+		 * Like syscall, but code is a quad, so as to maintain
+		 * quad alignment for the rest of the arguments.
+		 */
+		code = fuword(params + _QUAD_LOWWORD * sizeof(int));
+		params += sizeof(quad_t);
+		break;
+	default:
+		break;
+	}
+
+	code &= (SYS_NSYSENT - 1);
+	callp += code;
+	argsize = callp->sy_argsize;
+	if (argsize) {
+		/*
+		 * Linux passes the args in ebx, ecx, edx, esi, edi, ebp, in
+		 * increasing order.
+		 */
+		switch (argsize >> 2) {
+		case 6:
+			args[5] = frame->tf_rbp & 0xffffffff;
+		case 5:
+			args[4] = frame->tf_rdi & 0xffffffff;
+		case 4:
+			args[3] = frame->tf_rsi & 0xffffffff;
+		case 3:
+			args[2] = frame->tf_rdx & 0xffffffff;
+		case 2:
+			args[1] = frame->tf_rcx & 0xffffffff;
+		case 1:
+			args[0] = frame->tf_rbx & 0xffffffff;
+			break;
+		default:
+			printf("linux syscall %d bogus argument size %ld",
+			    code, argsize);
+			error = ENOSYS;
+			goto out;
+			break;
+		}
+	}
+#ifdef SYSCALL_DEBUG
+	scdebug_call(p, code, args);
+#endif /* SYSCALL_DEBUG */
+
+	rval[0] = 0;
+	rval[1] = 0;
+#if 0
+	printf("linux32: syscall %d (%x %x %x %x %x %x, %x)\n", code,
+	    args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+#endif
+	KERNEL_PROC_LOCK(l);
+	error = (*callp->sy_call)(l, args, rval);
+	KERNEL_PROC_UNLOCK(l);
+
+out:
+	switch (error) {
+	case 0:
+		frame->tf_rax = rval[0];
+		frame->tf_rflags &= ~PSL_C;	/* carry bit */
+		break;
+	case ERESTART:
+		/*
+		 * The offset to adjust the PC by depends on whether we entered
+		 * the kernel through the trap or call gate.  We pushed the
+		 * size of the instruction into tf_err on entry.
+		 */
+		frame->tf_rip -= frame->tf_err;
+		break;
+	case EJUSTRETURN:
+		/* nothing to do */
+		break;
+	default:
+		frame->tf_rax = native_to_linux32_errno[error];
+		frame->tf_rflags |= PSL_C;	/* carry bit */
+		break;
+	}
+
+#ifdef SYSCALL_DEBUG
+	scdebug_ret(p, code, error, rval);
+#endif /* SYSCALL_DEBUG */
+	userret(l);
+}
+
+void
+linux32_syscall_fancy(frame)
+	struct trapframe *frame;
+{
+	caddr_t params;
+	const struct sysent *callp;
+	struct proc *p;
+	struct lwp *l;
+	int error;
+	size_t argsize;
+	register32_t code, args[8];
+	register_t rval[2];
+#if defined(KTRACE) || defined(SYSTRACE)
+	int i;
+	register_t args64[8];
+#endif
+
+	uvmexp.syscalls++;
+	l = curlwp;
+	p = l->l_proc;
+
+	code = frame->tf_rax;
+	callp = p->p_emul->e_sysent;
+	params = (caddr_t)frame->tf_rsp + sizeof(int);
+
+	switch (code) {
+	case SYS_syscall:
+		/*
+		 * Code is first argument, followed by actual args.
+		 */
+		code = fuword(params);
+		params += sizeof(int);
+		break;
+	case SYS___syscall:
+		/*
+		 * Like syscall, but code is a quad, so as to maintain
+		 * quad alignment for the rest of the arguments.
+		 */
+		code = fuword(params + _QUAD_LOWWORD * sizeof(int));
+		params += sizeof(quad_t);
+		break;
+	default:
+		break;
+	}
+
+	code &= (SYS_NSYSENT - 1);
+	callp += code;
+	argsize = callp->sy_argsize;
+	if (argsize) {
+		/*
+		 * Linux passes the args in ebx, ecx, edx, esi, edi, ebp, in
+		 * increasing order.
+		 */
+		switch (argsize >> 2) { 
+		case 6:
+			args[5] = frame->tf_rbp & 0xffffffff;
+		case 5:
+			args[4] = frame->tf_rdi & 0xffffffff;
+		case 4:
+			args[3] = frame->tf_rsi & 0xffffffff;
+		case 3:
+			args[2] = frame->tf_rdx & 0xffffffff;
+		case 2:
+			args[1] = frame->tf_rcx & 0xffffffff;
+		case 1:
+			args[0] = frame->tf_rbx & 0xffffffff;
+			break;
+		default:
+			printf("linux syscall %d bogus argument size %ld",
+			    code, argsize);
+			error = ENOSYS;
+			goto out;
+			break;
+		}
+	}
+
+#if 0
+	printf("linux32: syscall %d (%x, %x, %x, %x, %x, %x, %x) [%ld]\n", code,
+	    args[0], args[1], args[2], args[3], args[4], args[5], args[6],
+	    (argsize >> 2));
+#endif
+	KERNEL_PROC_LOCK(l);
+
+#if defined(KTRACE) || defined(SYSTRACE)
+	if (
+#ifdef KTRACE
+	    KTRPOINT(p, KTR_SYSCALL) ||
+#endif
+#ifdef SYSTRACE
+	    ISSET(p->p_flag, P_SYSTRACE)
+#else
+	0
+#endif
+	) {
+		for (i = 0; i < (argsize >> 2); i++)
+			args64[i] = args[i] & 0xffffffff;
+		/* XXX we need to pass argsize << 1 here? */
+		if ((error = trace_enter(l, code, code, NULL, args64)) != 0)
+			goto out;
+	}
+#endif
+
+	rval[0] = 0;
+	rval[1] = 0;
+
+	error = (*callp->sy_call)(l, args, rval);
+#if defined(KTRACE) || defined(SYSTRACE)
+out:
+#endif
+	KERNEL_PROC_UNLOCK(l);
+	switch (error) {
+	case 0:
+		frame->tf_rax = rval[0];
+		frame->tf_rflags &= ~PSL_C;	/* carry bit */
+		break;
+	case ERESTART:
+		/*
+		 * The offset to adjust the PC by depends on whether we entered
+		 * the kernel through the trap or call gate.  We pushed the
+		 * size of the instruction into tf_err on entry.
+		 */
+		frame->tf_rip -= frame->tf_err;
+		break;
+	case EJUSTRETURN:
+		/* nothing to do */
+		break;
+	default:
+		frame->tf_rax = native_to_linux32_errno[error];
+		frame->tf_rflags |= PSL_C;	/* carry bit */
+		break;
+	}
+
+#if defined(KTRACE) || defined(SYSTRACE)
+	trace_exit(l, code, args64, rval, error);
+#endif
+
+	userret(l);
+}
--- a/sys/arch/amd64/amd64/mainbus.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/amd64/mainbus.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.10 2005/12/11 12:16:21 christos Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.10.2.1 2006/02/18 15:38:30 yamt Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2005/12/11 12:16:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10.2.1 2006/02/18 15:38:30 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,7 +59,6 @@
 
 #if NACPI > 0
 #include <dev/acpi/acpivar.h>
-#include <dev/acpi/acpi_madt.h>
 #endif
 
 /*
--- a/sys/arch/amd64/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.78.2.2 2006/02/01 14:51:25 yamt Exp $
+# $NetBSD: GENERIC,v 1.78.2.3 2006/02/18 15:38:30 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.78.2.2 $"
+#ident 		"GENERIC-$Revision: 1.78.2.3 $"
 
 maxusers	32		# estimated number of users
 
@@ -100,6 +100,8 @@
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
 options 	COMPAT_NETBSD32
+#options 	COMPAT_LINUX
+#options 	COMPAT_LINUX32	# req. COMPAT_LINUX and COMPAT_NETBSD32
 options 	EXEC_ELF32
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
@@ -123,6 +125,7 @@
 file-system	CODA		# Coda File System; also needs vcoda (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	QUOTA		# UFS quotas
@@ -829,24 +832,24 @@
 pseudo-device	fss		4	# file system snapshot device
 
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
+pseudo-device	ppp			# Point-to-Point Protocol
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	sl		2	# Serial Line IP
-pseudo-device	strip		2	# Starmode Radio IP (Metricom)
+pseudo-device	sl			# Serial Line IP
+pseudo-device	strip			# Starmode Radio IP (Metricom)
 pseudo-device	irframetty		# IrDA frame line discipline
-pseudo-device	tun		2	# network tunneling over tty
+pseudo-device	tun			# network tunneling over tty
 pseudo-device	tap			# virtual Ethernet
-pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/amd64/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.44.2.1 2006/01/15 10:02:36 yamt Exp $
+# $NetBSD: INSTALL,v 1.44.2.2 2006/02/18 15:38:30 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include	"arch/amd64/conf/std.amd64"
 
-#ident 		"INSTALL-$Revision: 1.44.2.1 $"
+#ident 		"INSTALL-$Revision: 1.44.2.2 $"
 
 maxusers	32		# estimated number of users
 
@@ -629,22 +629,22 @@
 #pseudo-device	fss		4	# file system snapshot device
 
 pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
+pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
 #pseudo-device	irframetty		# IrDA frame line discipline
-#pseudo-device	tun		2	# network tunneling over tty
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 
--- a/sys/arch/amd64/conf/SIMICS	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/conf/SIMICS	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: SIMICS,v 1.25 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: SIMICS,v 1.25.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 #	INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -505,16 +505,16 @@
 #pseudo-device	ccd		4	# concatenated/striped disk devices
 #pseudo-device	fss		4	# file system snapshot device
 #pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-#pseudo-device	bpfilter	8	# Berkeley packet filter
+#pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
-#pseudo-device	ppp		2	# Point-to-Point Protocol
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-#pseudo-device	tun		2	# network tunneling over tty
+#pseudo-device	ppp			# Point-to-Point Protocol
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+#pseudo-device	tun			# network tunneling over tty
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals (Sysinst needs two)
--- a/sys/arch/amd64/conf/files.amd64	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/conf/files.amd64	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amd64,v 1.19 2005/12/21 22:35:41 rjs Exp $
+#	$NetBSD: files.amd64,v 1.19.2.1 2006/02/18 15:38:30 yamt Exp $
 #
 # new style config file for amd64 architecture
 #
@@ -111,6 +111,7 @@
 device	pchb: pcibus
 attach	pchb at pci
 file	arch/amd64/pci/pchb.c			pchb
+file	arch/x86/pci/pchb_rnd.c			pchb & rnd
 
 # PCI-ISA bridges
 device	pcib: isabus
@@ -169,6 +170,12 @@
 file	arch/amd64/amd64/linux_syscall.c		compat_linux
 file	arch/x86/x86/linux_trap.c			compat_linux
 
+# Linux 32 bit compatibility (COMPAT_LINUX32)
+include "compat/linux32/files.linux32"
+include "compat/linux32/arch/amd64/files.linux32_amd64"
+file	arch/amd64/amd64/linux32_sigcode.S		compat_linux32
+file	arch/amd64/amd64/linux32_syscall.c		compat_linux32
+
 # OSS audio driver compatibility
 include	"compat/ossaudio/files.ossaudio"
 
--- a/sys/arch/amd64/include/Makefile	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/include/Makefile	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2005/12/11 12:16:25 christos Exp $
+#	$NetBSD: Makefile,v 1.4.2.1 2006/02/18 15:38:31 yamt Exp $
 
 INCSDIR= /usr/include/amd64
 
@@ -14,7 +14,7 @@
 	intr.h intrdefs.h \
 	joystick.h \
 	kcore.h \
-	limits.h lock.h \
+	limits.h linux32_machdep.h lock.h \
 	math.h mcontext.h mtrr.h \
 	netbsd32_machdep.h \
 	param.h pcb.h pci_machdep.h pio.h pmap.h pmc.h proc.h \
--- a/sys/arch/amd64/include/cpu_counter.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/include/cpu_counter.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_counter.h,v 1.2 2005/12/24 20:06:47 perry Exp $	*/
+/*	$NetBSD: cpu_counter.h,v 1.2.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,21 +49,21 @@
 
 #define cpu_hascounter()	(1)
 
-static inline uint64_t
+static __inline uint64_t
 cpu_counter(void)
 {
 
 	return (rdtsc());
 }
 
-static inline uint32_t
+static __inline uint32_t
 cpu_counter32(void)
 {
 
 	return (rdtsc() & 0xffffffffUL);
 }
 
-static inline uint64_t
+static __inline uint64_t
 cpu_frequency(struct cpu_info *ci)
 {
 	return (ci->ci_tsc_freq);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/include/linux32_machdep.h	Sat Feb 18 15:38:30 2006 +0000
@@ -0,0 +1,15 @@
+/*	$NetBSD: linux32_machdep.h,v 1.1.2.2 2006/02/18 15:38:31 yamt Exp $ */
+
+#ifndef _MACHINE_LINUX32_H_
+#define _MACHINE_LINUX32_H_
+
+#include <compat/netbsd32/netbsd32.h>
+
+#include <compat/linux32/common/linux32_types.h>
+
+#include <compat/linux32/arch/amd64/linux32_signal.h>
+#include <compat/linux32/arch/amd64/linux32_syscallargs.h>
+#include <compat/linux32/arch/amd64/linux32_syscall.h>
+#include <compat/linux32/arch/amd64/linux32_machdep.h>
+
+#endif /* _MACHINE_LINUX32_H_ */
--- a/sys/arch/amd64/include/param.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/include/param.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.1 2003/04/26 18:39:45 fvdl Exp $	*/
+/*	$NetBSD: param.h,v 1.1.30.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 #ifdef _KERNEL
 #ifdef _LOCORE
@@ -107,7 +107,7 @@
  * logical pages.
  */
 #define	NKMEMPAGES_MIN_DEFAULT	((8 * 1024 * 1024) >> PAGE_SHIFT)
-#define	NKMEMPAGES_MAX_DEFAULT	((128 * 1024 * 1024) >> PAGE_SHIFT)
+#define	NKMEMPAGES_MAX_DEFAULT	((1 *1024 * 1024 * 1024) >> PAGE_SHIFT)
 
 /* pages ("clicks") to disk blocks */
 #define	ctod(x)		((x) << (PGSHIFT - DEV_BSHIFT))
--- a/sys/arch/amd64/include/pmap.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/include/pmap.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.8 2005/12/24 20:06:47 perry Exp $	*/
+/*	$NetBSD: pmap.h,v 1.8.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*
  *
@@ -455,7 +455,7 @@
  * inline functions
  */
 
-static inline void
+static __inline void
 pmap_remove_all(struct pmap *pmap)
 {
 	/* Nothing. */
@@ -466,7 +466,7 @@
  *	if hardware doesn't support one-page flushing)
  */
 
-inline static void
+__inline static void
 pmap_update_pg(va)
 	vaddr_t va;
 {
@@ -477,7 +477,7 @@
  * pmap_update_2pg: flush two pages from the TLB
  */
 
-inline static void
+__inline static void
 pmap_update_2pg(va, vb)
 	vaddr_t va, vb;
 {
@@ -494,7 +494,7 @@
  *	unprotecting a page is done on-demand at fault time.
  */
 
-inline static void
+__inline static void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
 {
 	if ((prot & VM_PROT_WRITE) == 0) {
@@ -514,7 +514,7 @@
  *	unprotecting a page is done on-demand at fault time.
  */
 
-inline static void
+__inline static void
 pmap_protect(pmap, sva, eva, prot)
 	struct pmap *pmap;
 	vaddr_t sva, eva;
@@ -540,7 +540,7 @@
 
 #include <lib/libkern/libkern.h>
 
-static inline pt_entry_t *
+static __inline pt_entry_t *
 vtopte(vaddr_t va)
 {
 
@@ -549,7 +549,7 @@
 	return (PTE_BASE + pl1_i(va));
 }
 
-static inline pt_entry_t *
+static __inline pt_entry_t *
 kvtopte(vaddr_t va)
 {
 
--- a/sys/arch/amd64/include/profile.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/include/profile.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: profile.h,v 1.5 2005/12/11 12:16:25 christos Exp $	*/
+/*	$NetBSD: profile.h,v 1.5.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -65,7 +65,7 @@
 "	movq	0(%rbp),%r11	\n"			\
 "	movq	8(%r11),%rdi	\n"			\
 "	movq	8(%rbp),%rsi	\n"			\
-"	call	_mcount		\n"			\
+"	call	_mcount"__MCPLT "	\n"			\
 "	movq	0(%rsp),%rdi	\n"			\
 "	movq	8(%rsp),%rsi	\n"			\
 "	movq	16(%rsp),%rdx	\n"			\
--- a/sys/arch/amd64/include/userret.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/include/userret.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: userret.h,v 1.5 2005/12/24 20:06:47 perry Exp $	*/
+/*	$NetBSD: userret.h,v 1.5.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*
  * XXXfvdl same as i386 counterpart, but should probably be independent.
@@ -75,13 +75,13 @@
 
 #include <sys/userret.h>
 
-static inline void userret __P((register struct lwp *));
+static __inline void userret __P((register struct lwp *));
 
 /*
  * Define the code needed before returning to user mode, for
  * trap and syscall.
  */
-static inline void
+static __inline void
 userret(l)
 	register struct lwp *l;
 {
--- a/sys/arch/amd64/pci/pchb.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amd64/pci/pchb.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.5 2005/12/11 12:16:26 christos Exp $	*/
+/*	$NetBSD: pchb.c,v 1.5.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.5 2005/12/11 12:16:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.5.2.1 2006/02/18 15:38:31 yamt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -51,7 +51,7 @@
 
 #include <dev/pci/pcidevs.h>
 
-#include <arch/i386/pci/pchbvar.h>
+#include <arch/x86/pci/pchbvar.h>
 
 #include "rnd.h"
 
@@ -75,17 +75,14 @@
 #define I82424_BCTL_PCIMEM_BURSTEN	0x01
 #define I82424_BCTL_PCI_BURSTEN		0x02
 
-int	pchbmatch __P((struct device *, struct cfdata *, void *));
-void	pchbattach __P((struct device *, struct device *, void *));
+int	pchbmatch(struct device *, struct cfdata *, void *);
+void	pchbattach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(pchb, sizeof(struct pchb_softc),
     pchbmatch, pchbattach, NULL, NULL);
 
 int
-pchbmatch(parent, match, aux)
-	struct device *parent;
-	struct cfdata *match;
-	void *aux;
+pchbmatch(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct pci_attach_args *pa = aux;
 
@@ -98,10 +95,11 @@
 }
 
 void
-pchbattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+pchbattach(struct device *parent, struct device *self, void *aux)
 {
+#if NRND > 0
+	struct pchb_softc *sc = (void *) self;
+#endif
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 
@@ -121,4 +119,10 @@
 			break;
 	}
 
+#if NRND > 0
+	/*
+	 * Attach a random number generator, if there is one.
+	 */
+	pchb_attach_rnd(sc, pa);
+#endif
 }
--- a/sys/arch/amd64/pci/pchbvar.h	Sat Feb 18 14:52:24 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*	$NetBSD: pchbvar.h,v 1.1 2003/04/26 18:39:51 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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.
- */
-
-#ifndef _I386_PCI_PCHBVAR_H_
-#define	_I386_PCI_PCHBVAR_H_
-
-#include <sys/callout.h>
-#include <sys/rnd.h>
-
-struct pchb_softc {
-	struct device sc_dev;
-
-	bus_space_tag_t sc_st;
-	bus_space_handle_t sc_sh;
-
-	struct callout sc_rnd_ch;
-	rndsource_element_t sc_rnd_source;
-
-	int sc_rnd_i;
-	u_int32_t sc_rnd_ax;
-};
-
-void	pchb_attach_rnd(struct pchb_softc *, struct pci_attach_args *);
-
-#endif /* _I386_PCI_PCHBVAR_H_ */
--- a/sys/arch/amiga/conf/AMIGA	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/conf/AMIGA	Sat Feb 18 15:38:30 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: AMIGA,v 1.92 2005/12/10 14:54:40 tsutsui Exp $
+# $NetBSD: AMIGA,v 1.92.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.48 2005/12/10 14:53:10 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.50 2006/02/04 02:25:08 rpaulo Exp $
 #
 # GENERIC machine description file
 #
@@ -28,7 +28,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.92 $"
+#ident 		"GENERIC-$Revision: 1.92.2.1 $"
 
 
 maxusers	8
@@ -121,6 +121,7 @@
 file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # Filesystem options
 
@@ -455,17 +456,17 @@
 uk*	at scsibus? target ? lun ?	# scsi unknown
 
 pseudo-device	loop			# loopback network interface
-pseudo-device	sl		1	# SLIP network interfaces
-pseudo-device	ppp		1	# PPP network interfaces
+pseudo-device	sl			# SLIP network interfaces
+pseudo-device	ppp			# PPP network interfaces
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun		1	# network tunnel line discipline
+pseudo-device	tun			# network tunnel line discipline
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP Filter package
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@@ -480,7 +481,7 @@
 #pseudo-device	wsfont			# wsfont(4) dynamic font loading support
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 
-pseudo-device	vnd		4	# vnode pseudo-disks
+pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices
--- a/sys/arch/amiga/conf/DRACO	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/conf/DRACO	Sat Feb 18 15:38:30 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.108 2005/12/10 14:54:40 tsutsui Exp $
+# $NetBSD: DRACO,v 1.108.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.48 2005/12/10 14:53:10 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.50 2006/02/04 02:25:08 rpaulo Exp $
 #
 # GENERIC machine description file
 #
@@ -28,7 +28,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.108 $"
+#ident 		"GENERIC-$Revision: 1.108.2.1 $"
 
 
 maxusers	8
@@ -110,6 +110,7 @@
 file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # Filesystem options
 
@@ -326,17 +327,17 @@
 uk*	at scsibus? target ? lun ?	# scsi unknown
 
 pseudo-device	loop			# loopback network interface
-pseudo-device	sl		1	# SLIP network interfaces
-pseudo-device	ppp		1	# PPP network interfaces
+pseudo-device	sl			# SLIP network interfaces
+pseudo-device	ppp			# PPP network interfaces
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun		1	# network tunnel line discipline
+pseudo-device	tun			# network tunnel line discipline
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP Filter package
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@@ -351,7 +352,7 @@
 #pseudo-device	wsfont			# wsfont(4) dynamic font loading support
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 
-pseudo-device	vnd		4	# vnode pseudo-disks
+pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices
--- a/sys/arch/amiga/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.232 2005/12/10 14:54:40 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.232.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.48 2005/12/10 14:53:10 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.50 2006/02/04 02:25:08 rpaulo Exp $
 #
 # GENERIC machine description file
 #
@@ -28,7 +28,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.232 $"
+#ident 		"GENERIC-$Revision: 1.232.2.1 $"
 
 
 maxusers	8
@@ -122,6 +122,7 @@
 file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # Filesystem options
 
@@ -463,17 +464,17 @@
 uk*	at scsibus? target ? lun ?	# scsi unknown
 
 pseudo-device	loop			# loopback network interface
-pseudo-device	sl		1	# SLIP network interfaces
-pseudo-device	ppp		1	# PPP network interfaces
+pseudo-device	sl			# SLIP network interfaces
+pseudo-device	ppp			# PPP network interfaces
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun		1	# network tunnel line discipline
+pseudo-device	tun			# network tunnel line discipline
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP Filter package
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@@ -488,7 +489,7 @@
 #pseudo-device	wsfont			# wsfont(4) dynamic font loading support
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 
-pseudo-device	vnd		4	# vnode pseudo-disks
+pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices
--- a/sys/arch/amiga/conf/GENERIC.in	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.48 2005/12/10 14:53:10 tsutsui Exp $
+# $NetBSD: GENERIC.in,v 1.48.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # GENERIC machine description file
 #
@@ -56,7 +56,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.48 $"
+#ident 		"GENERIC-$Revision: 1.48.2.1 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -164,6 +164,7 @@
 file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 ')m4_dnl
 
 # Filesystem options
@@ -570,17 +571,17 @@
 ')m4_dnl
 
 pseudo-device	loop			# loopback network interface
-pseudo-device	sl		1	# SLIP network interfaces
-pseudo-device	ppp		1	# PPP network interfaces
+pseudo-device	sl			# SLIP network interfaces
+pseudo-device	ppp			# PPP network interfaces
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun		1	# network tunnel line discipline
+pseudo-device	tun			# network tunnel line discipline
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP Filter package
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@@ -608,7 +609,7 @@
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 ')m4_dnl
 
-pseudo-device	vnd		4	# vnode pseudo-disks
+pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices
--- a/sys/arch/amiga/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.65 2005/12/10 14:54:40 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.65.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.48 2005/12/10 14:53:10 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.50 2006/02/04 02:25:08 rpaulo Exp $
 #
 # GENERIC machine description file
 #
@@ -28,7 +28,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.65 $"
+#ident 		"GENERIC-$Revision: 1.65.2.1 $"
 
 makeoptions	COPTS="-Os"
 
@@ -401,17 +401,17 @@
 ch*	at scsibus? target ? lun ?	# scsi autochangers
 
 pseudo-device	loop			# loopback network interface
-pseudo-device	sl		1	# SLIP network interfaces
-pseudo-device	ppp		1	# PPP network interfaces
+pseudo-device	sl			# SLIP network interfaces
+pseudo-device	ppp			# PPP network interfaces
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun		1	# network tunnel line discipline
+pseudo-device	tun			# network tunnel line discipline
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP Filter package
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@@ -426,7 +426,7 @@
 #pseudo-device	wsfont			# wsfont(4) dynamic font loading support
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 
-pseudo-device	vnd		4	# vnode pseudo-disks
+pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices
--- a/sys/arch/amiga/conf/MDINSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/conf/MDINSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: MDINSTALL,v 1.24 2005/12/07 12:40:46 tsutsui Exp $
+#	$NetBSD: MDINSTALL,v 1.24.2.1 2006/02/18 15:38:31 yamt Exp $
 
 #
 # INSTALL kernel for ramdisk installation
@@ -276,13 +276,13 @@
 cd*	at scsibus? target ? lun ?	# scsi cds
 
 pseudo-device	loop			# loopback network interface
-pseudo-device	sl		1	# SLIP network interfaces
-pseudo-device	ppp		1	# PPP network interfaces
+pseudo-device	sl			# SLIP network interfaces
+pseudo-device	ppp			# PPP network interfaces
 
 pseudo-device	view		10	# views
 pseudo-device	pty			# pseudo-terminals
 
-pseudo-device	vnd		4	# vnode pseudo-disks
+pseudo-device	vnd			# vnode pseudo-disks
 
 # rnd is EXPERIMENTAL at this point.
 #pseudo-device	rnd			# /dev/random and in-kernel generator
--- a/sys/arch/amiga/conf/WSCONS	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/conf/WSCONS	Sat Feb 18 15:38:30 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: WSCONS,v 1.46 2005/12/10 14:54:40 tsutsui Exp $
+# $NetBSD: WSCONS,v 1.46.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.48 2005/12/10 14:53:10 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.50 2006/02/04 02:25:08 rpaulo Exp $
 #
 # GENERIC machine description file
 #
@@ -28,7 +28,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.46 $"
+#ident 		"GENERIC-$Revision: 1.46.2.1 $"
 
 
 maxusers	8
@@ -122,6 +122,7 @@
 file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # Filesystem options
 
@@ -435,17 +436,17 @@
 uk*	at scsibus? target ? lun ?	# scsi unknown
 
 pseudo-device	loop			# loopback network interface
-pseudo-device	sl		1	# SLIP network interfaces
-pseudo-device	ppp		1	# PPP network interfaces
+pseudo-device	sl			# SLIP network interfaces
+pseudo-device	ppp			# PPP network interfaces
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun		1	# network tunnel line discipline
+pseudo-device	tun			# network tunnel line discipline
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP Filter package
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@@ -460,7 +461,7 @@
 pseudo-device	wsfont			# wsfont(4) dynamic font loading support
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 
-pseudo-device	vnd		4	# vnode pseudo-disks
+pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices
--- a/sys/arch/amiga/include/pmap.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amiga/include/pmap.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.41 2005/12/24 20:06:47 perry Exp $	*/
+/*	$NetBSD: pmap.h,v 1.41.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /* 
  * Copyright (c) 1991 Regents of the University of California.
@@ -171,7 +171,7 @@
 
 #define	pmap_update(pmap)		/* nothing (yet) */
 
-static inline void
+static __inline void
 pmap_remove_all(struct pmap *pmap)
 {
 	/* Nothing. */
--- a/sys/arch/amigappc/conf/NULL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amigappc/conf/NULL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.21 2005/12/07 09:10:12 tsutsui Exp $
+# $NetBSD: NULL,v 1.21.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running make in this directory.
@@ -305,17 +305,17 @@
 #uk*	at scsibus? target ? lun ?	# scsi unknown
 
 #pseudo-device	loop			# loopback network interface
-#pseudo-device	sl		1	# SLIP network interfaces
-#pseudo-device	ppp		1	# PPP network interfaces
-#pseudo-device	tun		1	# network tunnel line discipline
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	sl			# SLIP network interfaces
+#pseudo-device	ppp			# PPP network interfaces
+#pseudo-device	tun			# network tunnel line discipline
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	ipfilter		# IP Filter package
 
 pseudo-device	view		4	# views (needed for grfcc)
 pseudo-device	pty			# pseudo-terminals
 
-#pseudo-device	vnd		4	# vnode pseudo-disks
+#pseudo-device	vnd			# vnode pseudo-disks
 #pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	raid		4	# RAIDframe disk driver
 
--- a/sys/arch/amigappc/include/bus.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amigappc/include/bus.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.2 2005/12/24 21:44:59 perry Exp $	*/
+/*	$NetBSD: bus.h,v 1.2.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*
  * Copyright (c) 1996 Leo Weppelman.  All rights reserved.
@@ -148,7 +148,7 @@
  * Inline definition of other _1 functions:
  */
 
-extern inline void
+extern __inline void
 bus_space_read_multi_1(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
@@ -159,7 +159,7 @@
 		*a = bus_space_read_1(t, h, o);
 }
 
-extern inline void
+extern __inline void
 bus_space_write_multi_1(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
@@ -170,7 +170,7 @@
 		bus_space_write_1(t, h, o, *a);
 }
 
-extern inline void
+extern __inline void
 bus_space_read_region_1(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
@@ -181,7 +181,7 @@
 		*a = bus_space_read_1(t, h, o++);
 }
 
-extern inline void
+extern __inline void
 bus_space_write_region_1(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
@@ -192,7 +192,7 @@
 		 bus_space_write_1(t, h, o++, *a);
 }
 
-extern inline void
+extern __inline void
 bus_space_set_region_1(t, h, o, v, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
@@ -203,7 +203,7 @@
 		 bus_space_write_1(t, h, o++, v);
 }
 
-extern inline void
+extern __inline void
 bus_space_copy_region_1(t, srch, srco, dsth, dsto, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	srch, dsth;
@@ -217,7 +217,7 @@
 	}
 }
 
-extern inline void
+extern __inline void
 bus_space_read_region_stream_1(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
@@ -228,7 +228,7 @@
 		*a = bus_space_read_1(t, h, o++);
 }
 
-extern inline void
+extern __inline void
 bus_space_write_region_stream_1(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
--- a/sys/arch/amigappc/include/intr.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/amigappc/include/intr.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.17 2005/12/24 23:23:59 perry Exp $	*/
+/*	$NetBSD: intr.h,v 1.17.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -101,10 +101,10 @@
 
 void do_pending_int __P((void));
 
-static inline int splraise __P((int));
-static inline int spllower __P((int));
-static inline void splx __P((int));
-static inline void softintr __P((int));
+static __inline int splraise __P((int));
+static __inline int spllower __P((int));
+static __inline void splx __P((int));
+static __inline void softintr __P((int));
 
 extern volatile int cpl, ipending, astpending, tickspending;
 extern int imask[];
@@ -114,7 +114,7 @@
  * achieved with the "eieio" instruction which the assembler
  * seems to detect and then doesn't move instructions past....
  */
-static inline int
+static __inline int
 splraise(ncpl)
 	int ncpl;
 {
@@ -127,7 +127,7 @@
 	return (ocpl);
 }
 
-static inline void
+static __inline void
 splx(ncpl)
 	int ncpl;
 {
@@ -138,7 +138,7 @@
 	__asm volatile("sync; eieio\n");	/* reorder protect */
 }
 
-static inline int
+static __inline int
 spllower(ncpl)
 	int ncpl;
 {
@@ -155,7 +155,7 @@
 
 /* Following code should be implemented with lwarx/stwcx to avoid
  * the disable/enable. i need to read the manual once more.... */
-static inline void
+static __inline void
 softintr(ipl)
 	int ipl;
 {
--- a/sys/arch/arc/conf/ARCTIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/ARCTIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: ARCTIC,v 1.41 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: ARCTIC,v 1.41.2.1 2006/02/18 15:38:31 yamt Exp $
 #	$OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
 #
 #	configuration file for DeskStation
@@ -247,20 +247,20 @@
 #pseudo-device	raid		4	# RAIDframe disk driver
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
-pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	ppp			# Point-to-Point Protocol
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
--- a/sys/arch/arc/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.131 2005/12/20 05:35:27 thorpej Exp $
+# $NetBSD: GENERIC,v 1.131.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.131 $"
+#ident		"GENERIC-$Revision: 1.131.2.1 $"
 
 maxusers	32		# estimated number of users
 
@@ -118,6 +118,7 @@
 #file-system	CODA		# Coda File System; also needs vcoda (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	QUOTA		# FFS quotas
@@ -416,23 +417,23 @@
 #options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
+pseudo-device	ppp			# Point-to-Point Protocol
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/arc/conf/M403	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/M403	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: M403,v 1.38 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: M403,v 1.38.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 #	configuration file for MIPS Magnum 4000 system
 #
@@ -196,20 +196,20 @@
 #pseudo-device	raid		4	# RAIDframe disk driver
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
-pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	ppp			# Point-to-Point Protocol
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
--- a/sys/arch/arc/conf/MIMORI	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/MIMORI	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: MIMORI,v 1.43 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: MIMORI,v 1.43.2.1 2006/02/18 15:38:31 yamt Exp $
 #	NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
 #
 #	MIMORI -- My NEC RISCstation 2250 (ur)
@@ -260,20 +260,20 @@
 #pseudo-device	raid		4	# RAIDframe disk driver
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
-pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
-pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	ppp			# Point-to-Point Protocol
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
+pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
--- a/sys/arch/arc/conf/PCCONS	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/PCCONS	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: PCCONS,v 1.51 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: PCCONS,v 1.51.2.1 2006/02/18 15:38:31 yamt Exp $
 #	$OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
 #
 #	PCCONS -- generic but pccons rather than wscons
@@ -342,20 +342,20 @@
 #pseudo-device	raid		4	# RAIDframe disk driver
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
-pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	ppp			# Point-to-Point Protocol
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
--- a/sys/arch/arc/conf/PICA	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/PICA	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: PICA,v 1.54 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: PICA,v 1.54.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 #	configuration file for ACER PICA system
 #
@@ -199,20 +199,20 @@
 #pseudo-device	raid		4	# RAIDframe disk driver
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
-pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	ppp			# Point-to-Point Protocol
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
--- a/sys/arch/arc/conf/RAMDISK	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/RAMDISK	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.66 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: RAMDISK,v 1.66.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 #	memory disk based configuration file for MIPS R4x00 ARC Systems
 #
@@ -7,7 +7,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.66 $"
+#ident		"GENERIC-$Revision: 1.66.2.1 $"
 
 maxusers	32		# estimated number of users
 
@@ -385,22 +385,22 @@
 #options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
+pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-#pseudo-device	tun		2	# network tunneling over tty
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 
--- a/sys/arch/arc/conf/RPC44	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/conf/RPC44	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RPC44,v 1.23 2005/12/20 05:35:27 thorpej Exp $
+# $NetBSD: RPC44,v 1.23.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.23 $"
+#ident		"GENERIC-$Revision: 1.23.2.1 $"
 
 maxusers	32		# estimated number of users
 
@@ -273,22 +273,22 @@
 #options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-#pseudo-device	ppp		2	# Point-to-Point Protocol
+#pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 
--- a/sys/arch/arc/include/bus.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arc/include/bus.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.20.2.1 2006/02/18 14:35:57 yamt Exp $	*/
+/*	$NetBSD: bus.h,v 1.20.2.2 2006/02/18 15:38:31 yamt Exp $	*/
 /*	NetBSD: bus.h,v 1.27 2000/03/15 16:44:50 drochner Exp 	*/
 /*	$OpenBSD: bus.h,v 1.15 1999/08/11 23:15:21 niklas Exp $	*/
 
@@ -332,7 +332,7 @@
  */
 
 #define bus_space_read(BYTES,BITS)					\
-static inline __CONCAT3(uint,BITS,_t)					\
+static __inline __CONCAT3(uint,BITS,_t)					\
 __CONCAT(bus_space_read_,BYTES)(bus_space_tag_t bst,			\
     bus_space_handle_t bsh, bus_size_t offset)				\
 {									\
@@ -355,7 +355,7 @@
  */
 
 #define bus_space_read_multi(BYTES,BITS)				\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_read_multi_,BYTES)(bus_space_tag_t bst,		\
     bus_space_handle_t bsh, bus_size_t offset,				\
     __CONCAT3(uint,BITS,_t) *datap, bus_size_t count)			\
@@ -384,7 +384,7 @@
  */
 
 #define bus_space_read_region(BYTES,BITS)				\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_read_region_,BYTES)(bus_space_tag_t bst,		\
     bus_space_handle_t bsh, bus_size_t offset,				\
     __CONCAT3(uint,BITS,_t) *datap, bus_size_t count)			\
@@ -415,7 +415,7 @@
  */
 
 #define bus_space_write(BYTES,BITS)					\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_write_,BYTES)(bus_space_tag_t bst,			\
     bus_space_handle_t bsh,						\
     bus_size_t offset, __CONCAT3(uint,BITS,_t) data)			\
@@ -439,7 +439,7 @@
  */
 
 #define bus_space_write_multi(BYTES,BITS)				\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_write_multi_,BYTES)(bus_space_tag_t bst,		\
     bus_space_handle_t bsh, bus_size_t offset,				\
     const __CONCAT3(uint,BITS,_t) *datap, bus_size_t count)		\
@@ -467,7 +467,7 @@
  */
 
 #define bus_space_write_region(BYTES,BITS)				\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_write_region_,BYTES)(bus_space_tag_t bst,		\
     bus_space_handle_t bsh, bus_size_t offset,				\
     const __CONCAT3(uint,BITS,_t) *datap, bus_size_t count)		\
@@ -498,7 +498,7 @@
  */
 
 #define bus_space_set_multi(BYTES,BITS)					\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_set_multi_,BYTES)(bus_space_tag_t bst,		\
     bus_space_handle_t bsh, bus_size_t offset,				\
     const __CONCAT3(uint,BITS,_t) data, bus_size_t count)		\
@@ -526,7 +526,7 @@
  */
 
 #define bus_space_set_region(BYTES,BITS)				\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_set_region_,BYTES)(bus_space_tag_t bst,		\
     bus_space_handle_t bsh, bus_size_t offset,				\
     __CONCAT3(uint,BITS,_t) data, bus_size_t count)			\
@@ -558,7 +558,7 @@
  */
 
 #define bus_space_copy_region(BYTES,BITS)				\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_copy_region_,BYTES)(bus_space_tag_t bst,		\
     bus_space_handle_t srcbsh, bus_size_t srcoffset,			\
     bus_space_handle_t dstbsh, bus_size_t dstoffset, bus_size_t count)	\
--- a/sys/arch/arm/ep93xx/ep93xxreg.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arm/ep93xx/ep93xxreg.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ep93xxreg.h,v 1.5 2005/11/12 05:33:23 hamajima Exp $ */
+/*	$NetBSD: ep93xxreg.h,v 1.5.4.1 2006/02/18 15:38:31 yamt Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -171,6 +171,7 @@
 #define   EP93XX_SYSCON_TEOI	0x00000018UL
 #define   EP93XX_SYSCON_ClkSet1	0x00000020UL
 #define   EP93XX_SYSCON_ClkSet2	0x00000024UL
+#define   EP93XX_SYSCON_DeviceCfg	0x00000080UL
 #define   EP93XX_SYSCON_ChipID	0x00000094UL
 #define  EP93XX_APB_TIMERS	0x00010000UL
 #define  EP93XX_APB_UART1	0x000c0000UL
--- a/sys/arch/arm/ep93xx/epe.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/arm/ep93xx/epe.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: epe.c,v 1.5 2005/12/24 20:06:52 perry Exp $	*/
+/*	$NetBSD: epe.c,v 1.5.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.5 2005/12/24 20:06:52 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.5.2.1 2006/02/18 15:38:31 yamt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -159,7 +159,7 @@
 		panic("%s: Cannot map registers", self->dv_xname);
 
 	/* Fetch the Ethernet address from property if set. */
-	if (prop_get(dev_propdb, 0, "mac-addr", sc->sc_enaddr,
+	if (devprop_get(self, "mac-addr", sc->sc_enaddr,
 		       ETHER_ADDR_LEN, NULL) == ETHER_ADDR_LEN) {
 		bus_space_write_4(sc->sc_iot, sc->sc_ioh, EPE_AFP, 0);
 		bus_space_write_region_1(sc->sc_iot, sc->sc_ioh, EPE_IndAd,
--- a/sys/arch/atari/conf/ATARITT	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/ATARITT	Sat Feb 18 15:38:30 2006 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: ATARITT,v 1.75 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: ATARITT,v 1.75.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: ATARITT.in,v 1.4 2001/04/10 06:28:38 leo Exp $
-#		NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
+#		NetBSD: GENERIC.in,v 1.59 2006/02/04 02:25:57 rpaulo Exp $
 include "arch/atari/conf/std.atari"
 
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -121,15 +121,15 @@
 
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
-pseudo-device vnd 3 # 3 pseudo disks (see vnconfig)
+pseudo-device vnd  # 3 pseudo disks (see vnconfig)
 
 pseudo-device md 3 # Boot memory disk
 
-pseudo-device bpfilter 2 # berkeley packet filters
-pseudo-device tun 2 # network tunnel
+pseudo-device bpfilter # berkeley packet filters
+pseudo-device tun  # network tunnel
 pseudo-device tap # virtual Ethernet
 
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif  # IPv[46] over IPv[46] tunnel (RFC1933)
 
 pseudo-device vlan # IEEE 802.1q encapsulation
 pseudo-device bridge # simple inter-network bridging
--- a/sys/arch/atari/conf/BOOT	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/BOOT	Sat Feb 18 15:38:30 2006 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: BOOT,v 1.67 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: BOOT,v 1.67.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: FALCON.in,v 1.7 2003/10/08 11:05:27 bouyer Exp $
-#		NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
+#		NetBSD: FALCON.in,v 1.8 2005/12/11 12:16:54 christos Exp $
+#		NetBSD: GENERIC.in,v 1.59 2006/02/04 02:25:57 rpaulo Exp $
 include "arch/atari/conf/std.atari"
 
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -62,7 +62,7 @@
 
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
-pseudo-device vnd 3 # 3 pseudo disks (see vnconfig)
+pseudo-device vnd  # 3 pseudo disks (see vnconfig)
 
 pseudo-device md 3 # Boot memory disk
 pseudo-device view 4 # View (graphics mapping)
--- a/sys/arch/atari/conf/BOOTX	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/BOOTX	Sat Feb 18 15:38:30 2006 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: BOOTX,v 1.62 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: BOOTX,v 1.62.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: FALCON.in,v 1.7 2003/10/08 11:05:27 bouyer Exp $
-#		NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
+#		NetBSD: FALCON.in,v 1.8 2005/12/11 12:16:54 christos Exp $
+#		NetBSD: GENERIC.in,v 1.59 2006/02/04 02:25:57 rpaulo Exp $
 include "arch/atari/conf/std.atari"
 
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -62,7 +62,7 @@
 
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
-pseudo-device vnd 3 # 3 pseudo disks (see vnconfig)
+pseudo-device vnd  # 3 pseudo disks (see vnconfig)
 
 pseudo-device md 3 # Boot memory disk
 pseudo-device view 4 # View (graphics mapping)
--- a/sys/arch/atari/conf/FALCON	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/FALCON	Sat Feb 18 15:38:30 2006 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: FALCON,v 1.73 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: FALCON,v 1.73.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: FALCON.in,v 1.7 2003/10/08 11:05:27 bouyer Exp $
-#		NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
+#		NetBSD: FALCON.in,v 1.8 2005/12/11 12:16:54 christos Exp $
+#		NetBSD: GENERIC.in,v 1.59 2006/02/04 02:25:57 rpaulo Exp $
 include "arch/atari/conf/std.atari"
 
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -117,15 +117,15 @@
 
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
-pseudo-device vnd 3 # 3 pseudo disks (see vnconfig)
+pseudo-device vnd  # 3 pseudo disks (see vnconfig)
 
 pseudo-device md 3 # Boot memory disk
 
-pseudo-device bpfilter 2 # berkeley packet filters
-pseudo-device tun 2 # network tunnel
+pseudo-device bpfilter # berkeley packet filters
+pseudo-device tun  # network tunnel
 pseudo-device tap # virtual Ethernet
 
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif  # IPv[46] over IPv[46] tunnel (RFC1933)
 
 pseudo-device ccd 4 # concatenating disk driver
 
--- a/sys/arch/atari/conf/GENERIC.in	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/GENERIC.in	Sat Feb 18 15:38:30 2006 +0000
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.in,v 1.57 2005/12/11 12:16:54 christos Exp $
+#	$NetBSD: GENERIC.in,v 1.57.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # Generic atari
 #
@@ -104,6 +104,8 @@
 file-system 	MSDOSFS		# MSDOS filesystem
 file-system 	CD9660		# ISO 9660 filesystem with Rock Ridge
 #file-system	PTYFS		# experimental - /dev/ptm support
+#file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 #ifndef INSTALL_KERNEL
 file-system 	NFS		# Network File System client side code
@@ -243,18 +245,18 @@
 #endif
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	loop			# Loopback network
-pseudo-device	vnd		3	# 3 pseudo disks (see vnconfig)
+pseudo-device	vnd			# 3 pseudo disks (see vnconfig)
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	md		3	# Boot memory disk
 
 #ifndef INSTALL_KERNEL
-pseudo-device	bpfilter	2	# berkeley packet filters
-pseudo-device	tun		2	# network tunnel
+pseudo-device	bpfilter		# berkeley packet filters
+pseudo-device	tun			# network tunnel
 pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #ifndef NO_PHYS_NETWORK
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
--- a/sys/arch/atari/conf/HADES	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/HADES	Sat Feb 18 15:38:30 2006 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: HADES,v 1.65 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: HADES,v 1.65.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: HADES.in,v 1.7 2003/10/08 11:05:27 bouyer Exp $
-#		NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
+#		NetBSD: HADES.in,v 1.8 2005/12/11 12:16:54 christos Exp $
+#		NetBSD: GENERIC.in,v 1.59 2006/02/04 02:25:57 rpaulo Exp $
 include "arch/atari/conf/std.hades"
 
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -125,15 +125,15 @@
 
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
-pseudo-device vnd 3 # 3 pseudo disks (see vnconfig)
+pseudo-device vnd  # 3 pseudo disks (see vnconfig)
 
 pseudo-device md 3 # Boot memory disk
 
-pseudo-device bpfilter 2 # berkeley packet filters
-pseudo-device tun 2 # network tunnel
+pseudo-device bpfilter # berkeley packet filters
+pseudo-device tun  # network tunnel
 pseudo-device tap # virtual Ethernet
 
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif  # IPv[46] over IPv[46] tunnel (RFC1933)
 
 pseudo-device vlan # IEEE 802.1q encapsulation
 pseudo-device bridge # simple inter-network bridging
--- a/sys/arch/atari/conf/MILAN-ISAIDE	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/MILAN-ISAIDE	Sat Feb 18 15:38:30 2006 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.41 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.41.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: MILAN.in,v 1.18 2005/05/31 22:23:52 tron Exp $
-#		NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
+#		NetBSD: MILAN.in,v 1.19 2005/12/11 12:16:54 christos Exp $
+#		NetBSD: GENERIC.in,v 1.59 2006/02/04 02:25:57 rpaulo Exp $
 include "arch/atari/conf/std.milan"
 
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -121,15 +121,15 @@
 
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
-pseudo-device vnd 3 # 3 pseudo disks (see vnconfig)
+pseudo-device vnd  # 3 pseudo disks (see vnconfig)
 
 pseudo-device md 3 # Boot memory disk
 
-pseudo-device bpfilter 2 # berkeley packet filters
-pseudo-device tun 2 # network tunnel
+pseudo-device bpfilter # berkeley packet filters
+pseudo-device tun  # network tunnel
 pseudo-device tap # virtual Ethernet
 
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif  # IPv[46] over IPv[46] tunnel (RFC1933)
 
 pseudo-device vlan # IEEE 802.1q encapsulation
 pseudo-device bridge # simple inter-network bridging
--- a/sys/arch/atari/conf/MILAN-PCIIDE	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/conf/MILAN-PCIIDE	Sat Feb 18 15:38:30 2006 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.45 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.45.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: MILAN.in,v 1.18 2005/05/31 22:23:52 tron Exp $
-#		NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
+#		NetBSD: MILAN.in,v 1.19 2005/12/11 12:16:54 christos Exp $
+#		NetBSD: GENERIC.in,v 1.59 2006/02/04 02:25:57 rpaulo Exp $
 include "arch/atari/conf/std.milan"
 
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -121,15 +121,15 @@
 
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
-pseudo-device vnd 3 # 3 pseudo disks (see vnconfig)
+pseudo-device vnd  # 3 pseudo disks (see vnconfig)
 
 pseudo-device md 3 # Boot memory disk
 
-pseudo-device bpfilter 2 # berkeley packet filters
-pseudo-device tun 2 # network tunnel
+pseudo-device bpfilter # berkeley packet filters
+pseudo-device tun  # network tunnel
 pseudo-device tap # virtual Ethernet
 
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif  # IPv[46] over IPv[46] tunnel (RFC1933)
 
 pseudo-device vlan # IEEE 802.1q encapsulation
 pseudo-device bridge # simple inter-network bridging
--- a/sys/arch/atari/include/pmap.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/atari/include/pmap.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.33 2005/12/24 20:06:58 perry Exp $	*/
+/*	$NetBSD: pmap.h,v 1.33.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /* 
  * Copyright (c) 1991 Regents of the University of California.
@@ -188,7 +188,7 @@
 
 #define	pmap_update(pmap)		/* nothing (yet) */
 
-static inline void
+static __inline void
 pmap_remove_all(struct pmap *pmap)
 {
 	/* Nothing. */
--- a/sys/arch/bebox/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/bebox/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.94 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.94.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.94 $"
+#ident 		"GENERIC-$Revision: 1.94.2.1 $"
 
 maxusers	32
 
@@ -78,6 +78,7 @@
 file-system 	UNION
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 #options 	FFS_EI		# FFS Endian Independant support
 options 	SOFTDEP		# FFS soft updates support.
@@ -114,13 +115,13 @@
 #pseudo-device 	crypto			# /dev/crypto device
 #pseudo-device	swcrypto		# software crypto implementation
 #pseudo-device	cgd		4	# cryptographic disk devices
-pseudo-device	vnd		4
+pseudo-device	vnd		
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	loop
-pseudo-device	bpfilter	8	# packet filter
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	bpfilter		# packet filter
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	bridge			# simple inter-network bridging
@@ -137,7 +138,7 @@
 # options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 # options	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 pseudo-device	fss		4	# file system snapshot device
-#pseudo-device	gre		2	# generic L3 over IP tunnel
+#pseudo-device	gre			# generic L3 over IP tunnel
 pseudo-device	wsmux
 pseudo-device	clockctl		# user control of clock subsystem
 
--- a/sys/arch/bebox/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/bebox/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.35 2005/12/07 12:40:46 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.35.2.1 2006/02/18 15:38:31 yamt Exp $
 #
 # First try for BEBOX config file
 #
@@ -78,11 +78,11 @@
 
 config		netbsd	root on ? type ffs
 
-#pseudo-device	vnd		4
+#pseudo-device	vnd		
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1
 pseudo-device	loop
-#pseudo-device	bpfilter	8	# packet filter
+#pseudo-device	bpfilter		# packet filter
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
 
 #
--- a/sys/arch/bebox/include/intr.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/bebox/include/intr.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.22 2005/12/24 23:23:59 perry Exp $	*/
+/*	$NetBSD: intr.h,v 1.22.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -89,10 +89,10 @@
 void enable_intr __P((void));
 void disable_intr __P((void));
 
-static inline int splraise __P((int));
-static inline int spllower __P((int));
-static inline void splx __P((int));
-static inline void set_sint __P((int));
+static __inline int splraise __P((int));
+static __inline int spllower __P((int));
+static __inline void splx __P((int));
+static __inline void set_sint __P((int));
 
 extern volatile int cpl, ipending, astpending, tickspending;
 extern int imask[];
@@ -103,7 +103,7 @@
  * achieved with the "eieio" instruction which the assembler
  * seems to detect and then doesn't move instructions past....
  */
-static inline int
+static __inline int
 splraise(newcpl)
 	int newcpl;
 {
@@ -116,7 +116,7 @@
 	return(oldcpl);
 }
 
-static inline void
+static __inline void
 splx(newcpl)
 	int newcpl;
 {
@@ -127,7 +127,7 @@
 	__asm volatile("sync; eieio\n");	/* reorder protect */
 }
 
-static inline int
+static __inline int
 spllower(newcpl)
 	int newcpl;
 {
@@ -144,7 +144,7 @@
 
 /* Following code should be implemented with lwarx/stwcx to avoid
  * the disable/enable. i need to read the manual once more.... */
-static inline void
+static __inline void
 set_sint(pending)
 	int	pending;
 {
--- a/sys/arch/bebox/include/kgdb.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/bebox/include/kgdb.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: kgdb.h,v 1.3 2005/12/24 20:06:58 perry Exp $	*/
+/*	$NetBSD: kgdb.h,v 1.3.2.1 2006/02/18 15:38:31 yamt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -45,7 +45,7 @@
 extern char kgdbstep;
 
 /* Doesn't handle overlapping regions */
-inline extern void
+__inline extern void
 kgdbcopy(s,d,n)
 	void *s, *d;
 	int n;
@@ -56,7 +56,7 @@
 		*dp++ = *sp++;
 }
 
-inline extern void
+__inline extern void
 kgdbzero(d,n)
 	void *d;
 	int n;
@@ -67,7 +67,7 @@
 		*dp++ = 0;
 }
 
-inline extern int
+__inline extern int
 kgdbcmp(s,d,n)
 	void *s, *d;
 {
--- a/sys/arch/cats/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cats/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.98 2005/12/20 05:35:27 thorpej Exp $
+# $NetBSD: GENERIC,v 1.98.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -73,6 +73,7 @@
 file-system	CODA		# Coda File System; also needs vcode (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	QUOTA		# UFS quotas
@@ -564,23 +565,23 @@
 pseudo-device	fss		4	# file system snapshot device
 #pseudo-device	cgd		2	# cryptographic disk devices
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
+pseudo-device	ppp			# Point-to-Point Protocol
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	sl		2	# Serial Line IP
-pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-pseudo-device	tun		2	# network tunneling over tty
+pseudo-device	sl			# Serial Line IP
+pseudo-device	strip			# Starmode Radio IP (Metricom)
+pseudo-device	tun			# network tunneling over tty
 pseudo-device	tap			# virtual Ethernet
-pseudo-device	gre		2	# generic L3 over IP tunnel
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	gre			# generic L3 over IP tunnel
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/cats/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cats/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.56 2005/12/20 05:35:27 thorpej Exp $
+#	$NetBSD: INSTALL,v 1.56.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -452,16 +452,16 @@
 pseudo-device	ccd		2	# concatenated/striped disk devices
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
-#pseudo-device	ppp		2	# Point-to-Point Protocol
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
-#pseudo-device	tun		2	# network tunneling over tty
+#pseudo-device	ppp			# Point-to-Point Protocol
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+#pseudo-device	tun			# network tunneling over tty
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
@@ -475,5 +475,5 @@
 pseudo-device	wsfont
 
 # for IPv6
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
--- a/sys/arch/cesfic/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cesfic/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.39 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.39.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -78,6 +78,7 @@
 #file-system 	MFS		# Memory-based filesystem
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # Filesystem options
 options 	FIFO		# POSIX fifo support (in all filesystems)
@@ -131,13 +132,13 @@
 le*		at mainbus0		# LANCE ethernet interfaces
 
 pseudo-device	pty		64	# pseudo ptys
-#pseudo-device	sl		4	# SLIP network interfaces
-#pseudo-device	ppp		4	# PPP network interfaces
+#pseudo-device	sl			# SLIP network interfaces
+#pseudo-device	ppp			# PPP network interfaces
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
-#pseudo-device	vnd		4	# vnode pseudo-disks
+#pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
 #pseudo-device	ccd		4	# concatenated disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices
--- a/sys/arch/cobalt/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cobalt/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.89 2005/12/20 05:35:27 thorpej Exp $
+# $NetBSD: GENERIC,v 1.89.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.89 $"
+#ident 		"GENERIC-$Revision: 1.89.2.1 $"
 
 maxusers	32
 
@@ -92,6 +92,7 @@
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
 #file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	NFSSERVER	# Sun NFS-compatible filesystem server
@@ -318,23 +319,23 @@
 # options	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 pseudo-device	fss		4		# file system snapshot device
 #pseudo-device	md		1		# memory disk device (ramdisk)
-#pseudo-device	vnd		4		# disk-like interface to files
+#pseudo-device	vnd				# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 
 # Network pseudo-devices
-pseudo-device	bpfilter	8		# Berkeley packet filter
+pseudo-device	bpfilter			# Berkeley packet filter
 #pseudo-device	ipfilter			# IP filter (firewall) and NAT
 pseudo-device	loop				# network loopback
-#pseudo-device	ppp		2		# Point-to-Point Protocol
+#pseudo-device	ppp				# Point-to-Point Protocol
 #pseudo-device	pppoe				# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2		# Serial Line IP
-#pseudo-device	strip		2		# Starmode Radio IP (Metricom)
-#pseudo-device	tun		2		# network tunneling over tty
+#pseudo-device	sl				# Serial Line IP
+#pseudo-device	strip				# Starmode Radio IP (Metricom)
+#pseudo-device	tun				# network tunneling over tty
 #pseudo-device	tap				# virtual Ethernet
-#pseudo-device	gre		2		# generic L3 over IP tunnel
-#pseudo-device	gif		4		# RFC1933 tunnel
-#pseudo-device	faith		1		# IPv[46] tcp relay translation
-#pseudo-device	stf		1		# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre				# generic L3 over IP tunnel
+#pseudo-device	gif				# RFC1933 tunnel
+#pseudo-device	faith				# IPv[46] tcp relay translation
+#pseudo-device	stf				# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/cobalt/conf/INSTALL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cobalt/conf/INSTALL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.16 2005/12/20 05:35:27 thorpej Exp $
+# $NetBSD: INSTALL,v 1.16.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.16 $"
+#ident 		"INSTALL-$Revision: 1.16.2.1 $"
 
 makeoptions     COPTS="-Os -mmemcpy"
 
@@ -297,22 +297,22 @@
 # options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 # options	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 #pseudo-device	md		1		# memory disk device (ramdisk)
-#pseudo-device	vnd		4		# disk-like interface to files
+#pseudo-device	vnd				# disk-like interface to files
 
 # Network pseudo-devices
-#pseudo-device	bpfilter	8		# Berkeley packet filter
+#pseudo-device	bpfilter			# Berkeley packet filter
 #pseudo-device	ipfilter			# IP filter (firewall) and NAT
 pseudo-device	loop				# network loopback
-#pseudo-device	ppp		2		# Point-to-Point Protocol
+#pseudo-device	ppp				# Point-to-Point Protocol
 #pseudo-device	pppoe				# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2		# Serial Line IP
-#pseudo-device	strip		2		# Starmode Radio IP (Metricom)
-#pseudo-device	tun		2		# network tunneling over tty
+#pseudo-device	sl				# Serial Line IP
+#pseudo-device	strip				# Starmode Radio IP (Metricom)
+#pseudo-device	tun				# network tunneling over tty
 #pseudo-device	tap				# virtual Ethernet
-#pseudo-device	gre		2		# generic L3 over IP tunnel
-#pseudo-device	gif		4		# RFC1933 tunnel
-#pseudo-device	faith		1		# IPv[46] tcp relay translation
-#pseudo-device	stf		1		# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre				# generic L3 over IP tunnel
+#pseudo-device	gif				# RFC1933 tunnel
+#pseudo-device	faith				# IPv[46] tcp relay translation
+#pseudo-device	stf				# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/cobalt/include/bus.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cobalt/include/bus.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.13.2.1 2006/02/18 14:49:22 yamt Exp $	*/
+/*	$NetBSD: bus.h,v 1.13.2.2 2006/02/18 15:38:32 yamt Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -149,11 +149,11 @@
  */
 
 #define __COBALT_bus_space_read_multi(BYTES,BITS)				\
-static inline void __CONCAT(bus_space_read_multi_,BYTES)		\
+static __inline void __CONCAT(bus_space_read_multi_,BYTES)		\
 	(bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
 	__PB_TYPENAME(BITS) *, size_t);					\
 									\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_read_multi_,BYTES)(t, h, o, a, c)			\
 	bus_space_tag_t t;						\
 	bus_space_handle_t h;						\
@@ -187,11 +187,11 @@
  */
 
 #define __COBALT_bus_space_read_region(BYTES,BITS)			\
-static inline void __CONCAT(bus_space_read_region_,BYTES)		\
+static __inline void __CONCAT(bus_space_read_region_,BYTES)		\
 	(bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
 	__PB_TYPENAME(BITS) *, size_t);					\
 									\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_read_region_,BYTES)(t, h, o, a, c)			\
 	bus_space_tag_t t;						\
 	bus_space_handle_t h;						\
@@ -257,11 +257,11 @@
  */
 
 #define __COBALT_bus_space_write_multi(BYTES,BITS)			\
-static inline void __CONCAT(bus_space_write_multi_,BYTES)		\
+static __inline void __CONCAT(bus_space_write_multi_,BYTES)		\
 	(bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
 	const __PB_TYPENAME(BITS) *, size_t);				\
 									\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_write_multi_,BYTES)(t, h, o, a, c)			\
 	bus_space_tag_t t;						\
 	bus_space_handle_t h;						\
@@ -295,11 +295,11 @@
  */
 
 #define __COBALT_bus_space_write_region(BYTES,BITS)			\
-static inline void __CONCAT(bus_space_write_region_,BYTES)		\
+static __inline void __CONCAT(bus_space_write_region_,BYTES)		\
 	(bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
 	const __PB_TYPENAME(BITS) *, size_t);				\
 									\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_write_region_,BYTES)(t, h, o, a, c)			\
 	bus_space_tag_t t;						\
 	bus_space_handle_t h;						\
@@ -335,11 +335,11 @@
  */
 
 #define __COBALT_bus_space_set_multi(BYTES,BITS)				\
-static inline void __CONCAT(bus_space_set_multi_,BYTES)		\
+static __inline void __CONCAT(bus_space_set_multi_,BYTES)		\
 	(bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
 	__PB_TYPENAME(BITS), size_t);					\
 									\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_set_multi_,BYTES)(t, h, o, v, c)			\
 	bus_space_tag_t t;						\
 	bus_space_handle_t h;						\
@@ -373,11 +373,11 @@
  */
 
 #define __COBALT_bus_space_set_region(BYTES,BITS)				\
-static inline void __CONCAT(bus_space_set_region_,BYTES)		\
+static __inline void __CONCAT(bus_space_set_region_,BYTES)		\
 	(bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
 	__PB_TYPENAME(BITS), size_t);					\
 									\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_set_region_,BYTES)(t, h, o, v, c)			\
 	bus_space_tag_t t;						\
 	bus_space_handle_t h;						\
@@ -414,13 +414,13 @@
  */
 
 #define	__COBALT_copy_region(BYTES)					\
-static inline void __CONCAT(bus_space_copy_region_,BYTES)		\
+static __inline void __CONCAT(bus_space_copy_region_,BYTES)		\
 	(bus_space_tag_t,						\
 	    bus_space_handle_t bsh1, bus_size_t off1,			\
 	    bus_space_handle_t bsh2, bus_size_t off2,			\
 	    bus_size_t count);						\
 									\
-static inline void							\
+static __inline void							\
 __CONCAT(bus_space_copy_region_,BYTES)(t, h1, o1, h2, o2, c)		\
 	bus_space_tag_t t;						\
 	bus_space_handle_t h1, h2;					\
--- a/sys/arch/cobalt/include/param.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cobalt/include/param.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.10 2005/12/24 20:06:58 perry Exp $	*/
+/*	$NetBSD: param.h,v 1.10.2.1 2006/02/18 15:38:32 yamt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -112,7 +112,7 @@
 #ifdef _KERNEL
 #ifndef _LOCORE
 
-inline extern void	delay(unsigned long);
+__inline extern void	delay(unsigned long);
 #define DELAY(n)	delay(n)
 
 #include <machine/intr.h>
--- a/sys/arch/cobalt/pci/pci_machdep.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/cobalt/pci/pci_machdep.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.18 2005/12/11 12:17:06 christos Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.18.2.1 2006/02/18 15:38:32 yamt Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.18 2005/12/11 12:17:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.18.2.1 2006/02/18 15:38:32 yamt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -248,6 +248,6 @@
 	if (dev == 9)
 		return 0;
 
-	return PCI_CONF_ALL & ~(PCI_CONF_MAP_ROM |
-	    PCI_COMMAND_SERR_ENABLE | PCI_COMMAND_PARITY_ENABLE);
+	return PCI_CONF_DEFAULT & ~(PCI_COMMAND_SERR_ENABLE |
+	    PCI_COMMAND_PARITY_ENABLE);
 }
--- a/sys/arch/dreamcast/conf/GENERIC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/dreamcast/conf/GENERIC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.66 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.66.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 # GENERIC machine description file
 # 
@@ -91,6 +91,7 @@
 #file-system	UNION		# union file system
 #file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 #options 	QUOTA		# UFS quotas
@@ -200,22 +201,22 @@
 
 #pseudo-device	cgd		2	# cryptographic disk devices
 pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		2	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
-#pseudo-device	ppp		1	# Point-to-Point Protocol
+#pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		1	# Serial Line IP
-#pseudo-device	tun		1	# network tunneling over tty
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		1	# generic L3 over IP tunnel
-#pseudo-device	gif		1	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/armadillo/armadillo9_com.c	Sat Feb 18 15:38:30 2006 +0000
@@ -0,0 +1,122 @@
+/*	$NetBSD: armadillo9_com.c,v 1.2.2.2 2006/02/18 15:38:32 yamt Exp $ */
+/*
+ * Copyright (c) 2002
+ *	Ichiro FUKUHARA <ichiro@ichiro.org>.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Ichiro FUKUHARA.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``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 ICHIRO FUKUHARA OR THE VOICES IN HIS HEAD 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>
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.2.2.2 2006/02/18 15:38:32 yamt Exp $");
+
+/* Front-end of epcom */
+
+#include <sys/types.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/param.h>
+#include <sys/malloc.h>
+
+#include <sys/termios.h>
+
+#include <machine/intr.h>
+#include <machine/bus.h>
+
+#include <arm/ep93xx/epcomreg.h>
+#include <arm/ep93xx/epcomvar.h>
+#include <arm/ep93xx/ep93xxreg.h>
+#include <arm/ep93xx/ep93xxvar.h>
+#include <arm/ep93xx/epsocvar.h>
+#include "epled.h"
+#if NEPLED > 0
+#include <arm/ep93xx/epledvar.h>
+#endif
+#include <evbarm/armadillo/armadillo9var.h>
+
+static int armadillo9com_match(struct device *, struct cfdata *, void *);
+static void armadillo9com_attach(struct device *, struct device *, void *);
+static int armadillo9com_intr(void *);
+
+CFATTACH_DECL(armadillo9com, sizeof(struct epcom_softc),
+    armadillo9com_match, armadillo9com_attach, NULL, NULL);
+
+static int
+armadillo9com_match(struct device *parent, struct cfdata *match, void *aux)
+{
+	if (strcmp(match->cf_name, "epcom") == 0)
+		return 1;
+	return 0;
+}
+
+static void
+armadillo9com_attach(struct device *parent, struct device *self, void *aux)
+{
+	struct epcom_softc *sc = (struct epcom_softc *)self;
+	struct epsoc_attach_args *sa = aux;
+	u_int32_t pwrcnt;
+	bus_space_handle_t ioh;
+
+	sc->sc_iot = sa->sa_iot;
+	sc->sc_hwbase = sa->sa_addr;
+
+	printf("\n");
+
+	bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size, 0, &sc->sc_ioh);
+
+	bus_space_map(sa->sa_iot, EP93XX_APB_HWBASE + EP93XX_APB_SYSCON,
+		EP93XX_APB_SYSCON_SIZE, 0, &ioh);
+	pwrcnt = bus_space_read_4(sa->sa_iot, ioh, EP93XX_SYSCON_PwrCnt);
+	pwrcnt &= ~(PwrCnt_UARTBAUD);
+	bus_space_write_4(sa->sa_iot, ioh, EP93XX_SYSCON_PwrCnt, pwrcnt);
+	bus_space_unmap(sa->sa_iot, ioh, EP93XX_APB_SYSCON_SIZE);
+
+	epcom_attach_subr(sc);
+	ep93xx_intr_establish(sa->sa_intr, IPL_SERIAL, armadillo9com_intr, sc);
+#if NEPLED > 0
+	if (armadillo_model->devcfg == DEVCFG_ARMADILLO210)
+		epled_red_off();
+#endif
+}
+
+static int
+armadillo9com_intr(void *arg)
+{
+	int n;
+
+#if NEPLED > 0  
+	if (armadillo_model->devcfg == DEVCFG_ARMADILLO210)
+        	epled_red_on();
+#endif
+	n = epcomintr(arg);
+#if NEPLED > 0
+	if (armadillo_model->devcfg == DEVCFG_ARMADILLO210)
+        	epled_red_off();  
+#endif  
+	return n;
+}
--- a/sys/arch/evbarm/armadillo/armadillo9_iic.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/armadillo/armadillo9_iic.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_iic.c,v 1.1 2005/11/13 06:33:05 hamajima Exp $	*/
+/*	$NetBSD: armadillo9_iic.c,v 1.1.6.1 2006/02/18 15:38:32 yamt Exp $	*/
 
 /*
  * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_iic.c,v 1.1 2005/11/13 06:33:05 hamajima Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_iic.c,v 1.1.6.1 2006/02/18 15:38:32 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,6 +37,7 @@
 #include <dev/i2c/i2c_bitbang.h>
 #include <arm/ep93xx/epsocvar.h> 
 #include <arm/ep93xx/epgpiovar.h>
+#include <evbarm/armadillo/armadillo9var.h>
 
 #include "seeprom.h"
 #if NSEEPROM > 0
@@ -93,7 +94,6 @@
 	struct i2cbus_attach_args iba;
 #if NSEEPROM > 0
 	struct epgpio_attach_args *ga = aux;
-	u_int8_t enaddr[ETHER_ADDR_LEN];
 #endif
 	lockinit(&sc->sc_buslock, PRIBIO|PCATCH, "armadillo9iiclk", 0, 0);
 
@@ -128,13 +128,12 @@
 	config_found(&sc->sc_dev, &iba, iicbus_print);
 
 #if NSEEPROM > 0
-	/* read and set mac address */
-	if (!seeprom_bootstrap_read(&sc->sc_i2c, 0x50, 0x00, 128,
-				   (uint8_t *)enaddr, ETHER_ADDR_LEN)
-	    && (prop_set(dev_propdb, 0, "mac-addr",
-			 enaddr, ETHER_ADDR_LEN, PROP_ARRAY, 0) != 0)) {
-		printf("WARNING: unable to set mac-addr property for %s\n",
-		       sc->sc_dev.dv_xname);
+	/* read mac address */
+	/* XXX This should probably be done elsewhere, earlier in bootstrap. */
+	if (seeprom_bootstrap_read(&sc->sc_i2c, 0x50, 0x00, 128,
+				   armadillo9_ethaddr, ETHER_ADDR_LEN) != 0) {
+		printf("%s: WARNING: unable to read MAC address from SEEPROM\n",
+		    sc->sc_dev.dv_xname);
 	}
 #endif
 }
--- a/sys/arch/evbarm/armadillo/armadillo9_machdep.c	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/armadillo/armadillo9_machdep.c	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_machdep.c,v 1.2 2005/12/24 22:45:34 perry Exp $	*/
+/*	$NetBSD: armadillo9_machdep.c,v 1.2.2.1 2006/02/18 15:38:32 yamt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Machine dependant functions for kernel setup for Iyonix.
+ * Machine dependant functions for kernel setup for Armadillo.
  */
 
 /*	Armadillo-9 physical memory map
@@ -110,7 +110,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.2 2005/12/24 22:45:34 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.2.2.1 2006/02/18 15:38:32 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -127,6 +127,9 @@
 #include <sys/termios.h>
 #include <sys/ksyms.h>
 
+#include <net/if.h>
+#include <net/if_ether.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
@@ -135,7 +138,9 @@
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 
+#define	DRAM_BLOCKS	4
 #include <machine/bootconfig.h>
+#include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
@@ -169,6 +174,13 @@
 #include <machine/isa_machdep.h>
 
 #include <evbarm/armadillo/armadillo9reg.h>
+#include <evbarm/armadillo/armadillo9var.h>
+
+struct armadillo_model_t *armadillo_model = 0;
+static struct armadillo_model_t armadillo_model_table[] = {
+	{ DEVCFG_ARMADILLO9, "Armadillo-9" },
+	{ DEVCFG_ARMADILLO210, "Armadillo-210" },
+	{ 0, "Armadillo(unknown model)" } };
 
 #include "opt_ipkdb.h"
 #include "ksyms.h"
@@ -255,6 +267,7 @@
 /*
  * Define the default console speed for the machine.
  */
+#if NEPCOM > 0
 #ifndef CONSPEED
 #define CONSPEED B115200
 #endif /* ! CONSPEED */
@@ -263,8 +276,15 @@
 #define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */
 #endif
 
+#ifndef CONUNIT
+#define	CONUNIT	0
+#endif
+
 int comcnspeed = CONSPEED;
 int comcnmode = CONMODE;
+const unsigned long comaddr[] = {
+	EP93XX_APB_UART1, EP93XX_APB_UART2 };
+#endif
 
 #if KGDB
 #ifndef KGDB_DEVNAME
@@ -289,6 +309,25 @@
 #endif /* KGDB */
 
 /*
+ * MAC address for the built-in Ethernet.
+ */
+uint8_t	armadillo9_ethaddr[ETHER_ADDR_LEN];
+
+static void
+armadillo9_device_register(device_t dev, void *aux)
+{
+
+	/* MAC address for the built-in Ethernet. */
+	if (strcmp(dev->dv_cfdata->cf_name, "epe") == 0) {
+		if (devprop_set(dev, "mac-addr", armadillo9_ethaddr,
+				ETHER_ADDR_LEN, PROP_ARRAY, 0) != 0) {
+			printf("WARNING: unable to set mac-addr property "
+			    "for %s\n", dev->dv_xname);
+		}
+	}
+}
+
+/*
  * void cpu_reboot(int howto, char *bootstr)
  *
  * Reboots the system
@@ -444,6 +483,8 @@
 	int loop1;
 	u_int l1pagetable;
 	pv_addr_t kernel_l1pt;
+	struct bootparam_tag *bootparam_p;
+	unsigned long devcfg;
 
 	/*
 	 * Since we map the on-board devices VA==PA, and the kernel
@@ -452,10 +493,47 @@
 	 */
 	consinit();
 
-#ifdef VERBOSE_INIT_ARM
+	/* identify model */
+	devcfg = *((volatile unsigned long*)(EP93XX_APB_HWBASE 
+					     + EP93XX_APB_SYSCON
+					     + EP93XX_SYSCON_DeviceCfg));
+	for (armadillo_model = &armadillo_model_table[0];
+				armadillo_model->devcfg; armadillo_model++)
+		if (devcfg == armadillo_model->devcfg)
+			break;
+
 	/* Talk to the user */
-	printf("\nNetBSD/armadillo9 booting ...\n");
+	printf("\nNetBSD/%s booting ...\n", armadillo_model->name);
+
+	/* set some informations from bootloader */
+	bootparam_p = (struct bootparam_tag *)bootparam;
+	bootconfig.dramblocks = 0;
+	while (bootparam_p->hdr.tag != BOOTPARAM_TAG_NONE) {
+		switch (bootparam_p->hdr.tag) {
+		case BOOTPARAM_TAG_MEM:
+			if (bootconfig.dramblocks < DRAM_BLOCKS) {
+#ifdef VERBOSE_INIT_ARM
+			printf("dram[%d]: address=0x%08lx, size=0x%08lx\n",
+						bootconfig.dramblocks,
+						bootparam_p->u.mem.start,
+						bootparam_p->u.mem.size);
 #endif
+				bootconfig.dram[bootconfig.dramblocks].address =
+					bootparam_p->u.mem.start;
+				bootconfig.dram[bootconfig.dramblocks].pages =
+					bootparam_p->u.mem.size / PAGE_SIZE;
+				bootconfig.dramblocks++;
+			}
+			break;
+		case BOOTPARAM_TAG_CMDLINE:
+#ifdef VERBOSE_INIT_ARM
+			printf("cmdline: %s\n", bootparam_p->u.cmdline.cmdline);
+#endif
+			parse_mi_bootargs(bootparam_p->u.cmdline.cmdline);
+			break;
+		}
+		bootparam_p = bootparam_tag_next(bootparam_p);
+	}
 
 	/*
 	 * Heads up ... Setup the CPU / MMU / TLB functions
@@ -466,15 +544,6 @@
 #ifdef VERBOSE_INIT_ARM
 	printf("initarm: Configuring system ...\n");
 #endif
-
-	/* Fake bootconfig structure for the benefit of pmap.c */
-	/* XXX must make the memory description h/w independant */
-	bootconfig.dramblocks = 2;
-	bootconfig.dram[0].address = 0xc0000000UL;
-	bootconfig.dram[0].pages = 0x2000000UL / PAGE_SIZE;
-	bootconfig.dram[1].address = 0xc4000000UL;
-	bootconfig.dram[1].pages = 0x2000000UL / PAGE_SIZE;
-
 	/*
 	 * Set up the variables that define the availablilty of
 	 * physical memory.  For now, we're going to set
@@ -773,17 +842,15 @@
 	uvm_page_physload(atop(0xc0000000), atop(physical_freeend_low),
 	    atop(0xc0000000), atop(physical_freeend_low),
 	    VM_FREELIST_DEFAULT);
-	/*
-	 * There is 64 MB of memory on the Armadillo-9 in 2 32MB chunks, so
-	 * for we've only been working with the first one mapped at
-	 * 0xc0000000. Tell UVM about the others.	
-	 */
-	uvm_page_physload(atop(0xc4000000), atop(0xc6000000),
-	    atop(0xc4000000), atop(0xc6000000),
-	    VM_FREELIST_DEFAULT);
-
-	physmem = 0x4000000 / PAGE_SIZE;
-	
+	physmem = bootconfig.dram[0].pages;
+	for (loop = 1; loop < bootconfig.dramblocks; ++loop) {
+		size_t start = bootconfig.dram[loop].address;
+		size_t size = bootconfig.dram[loop].pages * PAGE_SIZE;
+		uvm_page_physload(atop(start), atop(start + size),
+				  atop(start), atop(start + size),
+				  VM_FREELIST_DEFAULT);
+		physmem += bootconfig.dram[loop].pages;
+	}
 
 	/* Boot strap pmap telling it where the kernel page table is */
 #ifdef VERBOSE_INIT_ARM
@@ -833,6 +900,9 @@
 		Debugger();
 #endif
 
+	/* We have our own device_register() */
+	evbarm_device_register = armadillo9_device_register;
+
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
 }
@@ -856,21 +926,11 @@
 	 * device.
 	 */
 	pmap_devmap_register(armadillo9_devmap);
-#if 0
-	isa_armadillo9_init(ARMADILLO9_IO16_VBASE + ARMADILLO9_ISAIO,
-		ARMADILLO9_IO16_VBASE + ARMADILLO9_ISAMEM);	
-
-        if (comcnattach(&isa_io_bs_tag, 0x3e8, comcnspeed,
-            COM_FREQ, COM_TYPE_NORMAL, comcnmode))
-        {
-                panic("can't init serial console");
-        }
-#endif
 
 #if NEPCOM > 0
-	bus_space_map(&ep93xx_bs_tag, EP93XX_APB_HWBASE + EP93XX_APB_UART1, 
+	bus_space_map(&ep93xx_bs_tag, EP93XX_APB_HWBASE + comaddr[CONUNIT], 
 		EP93XX_APB_UART_SIZE, 0, &ioh);
-        if (epcomcnattach(&ep93xx_bs_tag, EP93XX_APB_HWBASE + EP93XX_APB_UART1, 
+        if (epcomcnattach(&ep93xx_bs_tag, EP93XX_APB_HWBASE + comaddr[CONUNIT], 
 		ioh, comcnspeed, comcnmode))
 	{
 		panic("can't init serial console");
--- a/sys/arch/evbarm/armadillo/armadillo9_start.S	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/armadillo/armadillo9_start.S	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_start.S,v 1.1 2005/11/13 06:33:05 hamajima Exp $ */
+/*	$NetBSD: armadillo9_start.S,v 1.1.6.1 2006/02/18 15:38:32 yamt Exp $ */
 
 /*
  * Copyright (c) 2003
@@ -32,9 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #include <machine/asm.h>
 #include <arm/armreg.h>
 #include <arm/arm32/pte.h>
+#include "epcom.h"
 
 	.section .start,"ax",%progbits
 
@@ -71,55 +73,18 @@
 	mov	pc, r8			/* Heave-ho! */
 
 Lunmapped:
-#ifdef VERBOSE_INIT_ARM
 	/* set temporary stack pointer */
-	adr	sp, Ltable
-	ldr	sp, [sp]
+	ldr	sp, Ltable
 
-	/* initialize UART1 */
-	bl	init_UART1
-#endif
-	/* copy to virtual address */
-	adr	r0, Lsection
-	ldmia	r0, {r0, r1, r2}	/* r0: kernel(load) start address */
-					/* r1: kernel(virtual) start address */
-					/* r2: kernel(virtual) end address */
-	sub	r3, r2, r1		/* r3: kernel size */
-	add	r4, r0, r3		/* r4: kernel(load) end address */
 #ifdef VERBOSE_INIT_ARM
-#define	putc(c)	 \
-	mov	r5, c	;\
-	bl	print_char
-	putc(#'c')
-	putc(#'o')
-	putc(#'p')
-	putc(#'y')
-	putc(#' ')
-	putc(#'f')
-	putc(#'r')
-	putc(#'o')
-	putc(#'m')
-	putc(#' ')
-	bl	print_r0
-	putc(#' ')
-	putc(#'t')
-	putc(#'o')
-	putc(#' ')
-	bl	print_r1
-	putc(#' ')
-	putc(#'s')
-	putc(#'i')
-	putc(#'z')
-	putc(#'e')
-	putc(#' ')
-	bl	print_r3
-	bl	print_cr
+	/* initialize UART */
+	bl	init_UART
 #endif
-1:
-	ldr	r5, [r4], #-4
-	str	r5, [r2], #-4
-	cmp	r4, r0
-	bge	1b
+	/* copy bootparam */
+	bl	copy_bootparam
+
+	/* copy myself to virtual address */
+	bl	copy_myself
 
 	/*
 	 * We want to construct a memory map that maps us
@@ -192,9 +157,11 @@
 	mov	r2, r2			/* force it to complete */
 	mov	pc, r1			/* leap to kernel entry point! */
 
+#define BOOTPARAM_ADDRESS	0xc0000100
+#define BOOTPARAM_SIZE		0x0f00
+
 Ltable:
 	.word	armadillo9_start - L1_TABLE_SIZE
-
 Lstart:
 	.word	start
 
@@ -203,90 +170,167 @@
 	.word	0xc0200000
 	.word	__bss_start
 
+Lbootparam_address:
+	.word	BOOTPARAM_ADDRESS
+
+copy_myself:
+	stmfd	sp!, {r0-r5, lr}
+	adr	r0, Lsection
+	ldmia	r0, {r1, r2, r4}	/* r1: kernel(load) start address */
+					/* r2: kernel(virtual) start address */
+					/* r3: kernel size */
+	sub	r3, r4, r2		/* r4: kernel(virtual) end address */
+	add	r5, r1, r3		/* r5: kernel(load) end address */
 #ifdef VERBOSE_INIT_ARM
-init_UART1:
-	stmfd	sp!, {r4, r5, lr}
-	mov	r4, #0x80000000
-	add	r4, r4, #0x008c0000
+	adr	r0, Lmsg1	/* "copy kernel from " */
+	bl	print_str
+	bl	print_r1
+	adr	r0, Lmsg2	/* " to " */
+	bl	print_str
+	bl	print_r2
+	adr	r0, Lmsg3	/* " size " */
+	bl	print_str
+	bl	print_r3
+	bl	print_cr
+#endif
+1:
+	ldr	r0, [r5], #-4
+	str	r0, [r4], #-4
+	cmp	r5, r1
+	bge	1b
+	ldmfd	sp!, {r0-r5, pc}
+
+copy_bootparam:
+	stmfd	sp!, {r0-r3, lr}
+	mov	r1, #BOOTPARAM_SIZE
+	ldr	r2, Lbootparam_address
+	adr	r3, _C_LABEL(bootparam)
+#ifdef VERBOSE_INIT_ARM
+	adr	r0, Lmsg0	/* "copy bootparam from " */
+	bl	print_str
+	bl	print_r2
+	adr	r0, Lmsg2	/* " to " */
+	bl	print_str
+	bl	print_r3
+	adr	r0, Lmsg3	/* " size " */
+	bl	print_str
+	bl	print_r1
+	bl	print_cr
+#endif
+1:
+	ldr	r0, [r2], #4
+	str	r0, [r3], #4
+	subs	r1, r1, #4
+	bne	1b
+	ldmfd	sp!, {r0-r3, pc}
+
+#ifdef VERBOSE_INIT_ARM
+Lmsg0:
+	.asciz	"copy bootparam from "
+	.align 0
+Lmsg1:
+	.asciz	"copy kernel from "
+	.align 0
+Lmsg2:
+	.asciz	" to "
+	.align 0
+Lmsg3:
+	.asciz	" size "
+	.align 0
+
+#if NEPCOM > 0
+#define EP93XX_APB_UART1	0x808c0000
+#define EP93XX_APB_UART2	0x808d0000
+
+#ifndef CONUNIT
+#define	CONUNIT	0
+#endif
+
+Lcomaddr:
+	.word	EP93XX_APB_UART1
+	.word	EP93XX_APB_UART2
+#endif
+
+init_UART:
+	stmfd	sp!, {r4-r5, lr}
+#if NEPCOM > 0
+	ldr	r4, Lcomaddr+(CONUNIT*4)
 	ldr	r5, [r4, #0x08]
 	orr	r5, r5, #0x10
 	str	r5, [r4, #0x08]	/* enable FIFO */
 	mov	r5, #0x01
 	str	r5, [r4, #0x14]	/* disable interrupt */
-	ldmfd	sp!, {r4, r5, pc}
+#endif
+	ldmfd	sp!, {r4-r5, pc}
 
-print_char:	/* char = r5 */
-	stmfd	sp!, {r4, r6, lr}
-	mov	r4, #0x80000000
-	add	r4, r4, #0x008c0000
+print_char:	/* char = r0 */
+	stmfd	sp!, {r4-r5, lr}
+#if NEPCOM > 0
+	ldr	r4, Lcomaddr+(CONUNIT*4)
 1:
-	ldr	r6, [r4, #0x18]
-	tst	r6, #0x20	/* check TXFF */
+	ldr	r5, [r4, #0x18]
+	tst	r5, #0x20	/* check TXFF */
 	bne	1b
-	str	r5, [r4, #0x00]
-	ldmfd	sp!, {r4, r6, pc}
+	str	r0, [r4, #0x00]
+#endif
+	ldmfd	sp!, {r4-r5, pc}
 
 print_cr:
-	stmfd	sp!, {r5, lr}
-	mov	r5, #0x0d	/* cr */
+	stmfd	sp!, {r0, lr}
+#if NEPCOM > 0
+	mov	r0, #0x0d	/* cr */
 	bl	print_char
-	mov	r5, #0x0a	/* lf */
+	mov	r0, #0x0a	/* lf */
 	bl	print_char
-	ldmfd	sp!, {r5, pc}
+#endif
+	ldmfd	sp!, {r0, pc}
 
-print_r0:
-	stmfd	sp!, {r0, r4-r7, lr}
+print_str:
+	stmfd	sp!, {r0, r4, lr}
+#if NEPCOM > 0
+	mov	r4, r0
+1:
+	ldrb	r0, [r4], #1
+	cmp	r0, #0
+	beq	2f
+	bl	print_char
+	b	1b
+2:
+#endif
+	ldmfd	sp!, {r0, r4, pc}
+
+print_r3:
+	stmfd	sp!, {r0, r3-r6, lr}
+#if NEPCOM > 0
 	mov	r4, #28
-	mov	r6, #0xf
+	mov	r5, #0xf
 1:	
-	and	r7, r6, r0, ROR r4
-	cmp	r7, #10
-	addlt	r5, r7, #'0'
-	addge	r5, r7, #('a' - 0x0a)
+	and	r6, r5, r3, ROR r4
+	cmp	r6, #10
+	addlt	r0, r6, #'0'
+	addge	r0, r6, #('a' - 0x0a)
 	bl	print_char
 	subs	r4, r4, #4
 	bge	1b
-	ldmfd	sp!, {r0, r4-r7, pc}
+#endif
+	ldmfd	sp!, {r0, r3-r6, pc}
 
 #define	print_register(reg)	 \
-	stmfd	sp!, {r0, lr}	;\
-	mov	r0, reg		;\
-	bl	print_r0	;\
-	ldmfd	sp!, {r0, pc}
+	stmfd	sp!, {r3, lr}	;\
+	mov	r3, reg		;\
+	bl	print_r3	;\
+	ldmfd	sp!, {r3, pc}
+
+print_r0:
+	print_register(r0)
 
 print_r1:
 	print_register(r1)
 
 print_r2:
 	print_register(r2)
-
-print_r3:
-	print_register(r3)
-
-print_r4:
-	print_register(r4)
-
-print_r5:
-	print_register(r5)
-
-print_r6:
-	print_register(r6)
-
-print_r7:
-	print_register(r7)
+#endif
 
-print_r8:
-	print_register(r8)
-
-print_r9:
-	print_register(r9)
-
-print_r10:
-	print_register(r10)
-
-print_r11:
-	print_register(r11)
-
-print_r12:
-	print_register(r12)
-#endif
+	.global	_C_LABEL(bootparam)
+_C_LABEL(bootparam):
+	.space	BOOTPARAM_SIZE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/armadillo/armadillo9var.h	Sat Feb 18 15:38:30 2006 +0000
@@ -0,0 +1,79 @@
+/*	$NetBSD: armadillo9var.h,v 1.2.2.2 2006/02/18 15:38:32 yamt Exp $	*/
+
+/*
+ * Copyright (c) 2006 HAMAJIMA Katsuomi. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ */
+
+#ifndef _ARMADILLO9VAR_H_
+#define	_ARMADILLO9VAR_H_
+
+/* model type */
+
+#define DEVCFG_ARMADILLO9	0x08140000
+#define DEVCFG_ARMADILLO210	0x0a140d00
+
+struct armadillo_model_t {
+	unsigned long devcfg;
+	const char *name;
+};
+
+extern struct armadillo_model_t *armadillo_model;
+
+
+/* information from bootloader */
+
+#define BOOTPARAM_TAG_NONE	0x00000000
+#define BOOTPARAM_TAG_MEM	0x54410002
+#define BOOTPARAM_TAG_CMDLINE	0x54410009
+
+struct bootparam_tag_header {
+	unsigned long  size;
+	unsigned long  tag;
+};
+
+struct bootparam_tag_mem32 {
+	unsigned long 	size;
+	unsigned long 	start;
+};
+
+struct bootparam_tag_cmdline {
+	char	cmdline[1];
+};
+
+struct bootparam_tag {
+	struct bootparam_tag_header hdr;
+	union {
+		struct bootparam_tag_mem32	mem;
+		struct bootparam_tag_cmdline	cmdline;
+	} u;
+};
+
+#define bootparam_tag_next(t)		\
+	((struct bootparam_tag *)((unsigned long *)(t) + (t)->hdr.size))
+
+extern char bootparam[];
+
+extern uint8_t armadillo9_ethaddr[];
+
+#endif /* _ARMADILLO9VAR_H_ */
--- a/sys/arch/evbarm/conf/ADI_BRH	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/ADI_BRH	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: ADI_BRH,v 1.32 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: ADI_BRH,v 1.32.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
 #
@@ -217,11 +217,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO210	Sat Feb 18 15:38:30 2006 +0000
@@ -0,0 +1,224 @@
+#	$NetBSD: ARMADILLO210,v 1.2.2.2 2006/02/18 15:38:32 yamt Exp $
+#
+#	ARMADILLO210 -- Atmark Techno, Armadillo-210
+#
+
+include	"arch/evbarm/conf/std.armadillo9"
+
+#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
+options		MSGBUFSIZE=65536
+#options 	KSTACK_CHECK_MAGIC
+
+# estimated number of users
+maxusers	8
+
+# Standard system options
+options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+options 	NTP		# NTP phase/frequency locked loop
+
+# CPU options
+options 	CPU_ARM9	# Support the ARM9TDMI core
+
+# File systems
+file-system	FFS		# UFS
+#file-system	LFS		# log-structured file system
+file-system	MFS		# memory file system
+file-system	NFS		# Network file system
+#file-system 	ADOSFS		# AmigaDOS-compatible file system
+#file-system 	EXT2FS		# second extended file system (linux)
+#file-system	CD9660		# ISO 9660 + Rock Ridge file system
+#file-system	MSDOSFS		# MS-DOS file system
+#file-system	FDESC		# /dev/fd
+#file-system	FILECORE	# Acorn filecore file system
+#file-system	KERNFS		# /kern
+#file-system	NULLFS		# loopback file system
+#file-system	PORTAL		# portal filesystem (still experimental)
+#file-system	PROCFS		# /proc
+#file-system	UMAPFS		# NULLFS + uid and gid remapping
+#file-system	UNION		# union file system
+#file-system	PTYFS		# /dev/pts/N support
+
+# File system options
+#options 	QUOTA		# UFS quotas
+#options 	FFS_EI		# FFS Endian Independant support
+#options 	SOFTDEP		# FFS soft updates support
+#options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
+#options 	NFSSERVER	# Network File System server
+#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
+#options	EXT2FS_SYSTEM_FLAGS	# makes ext2fs file flags (append and
+					# immutable) behave as system flags.
+
+# Networking options
+#options 	GATEWAY		# packet forwarding
+options 	INET		# IP + ICMP + TCP + UDP
+options 	INET6		# IPV6
+#options 	IPSEC		# IP security
+#options 	IPSEC_ESP	# IP security (encryption part; define w/ IPSEC)
+#options	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
+#options 	IPSEC_DEBUG	# debug for IP security
+#options 	MROUTING	# IP multicast routing
+#options	PIM		# Protocol Independent Multicast
+#options 	NS		# XNS
+#options 	NSIP		# XNS tunneling over IP
+#options 	ISO,TPIP	# OSI
+#options 	EON		# OSI tunneling over IP
+#options 	CCITT,LLC,HDLC	# X.25
+#options 	NETATALK	# AppleTalk networking
+#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
+#options 	PPP_DEFLATE	# Deflate compression support for PPP
+#options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
+#options 	PFIL_HOOKS	# pfil(9) packet filter hooks
+#options	IPFILTER_LOG	# ipmon(8) log support
+#options	IPFILTER_DEFAULT_BLOCK	# block all packets by default
+#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
+
+# These options control the verified exec feature
+#options	VERIFIED_EXEC
+
+options 	NFS_BOOT_BOOTP
+#options 	NFS_BOOT_DHCP
+#options 	NFS_BOOT_BOOTPARAM
+
+# Compatibility options
+#options 	COMPAT_16	# NetBSD 1.6 compatibility.
+#options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
+#options 	COMPAT_43	# 4.3BSD compatibility.
+#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
+#options	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
+#options 	COMPAT_LINUX	# binary compatibility with Linux
+options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+
+# Shared memory options
+#options 	SYSVMSG		# System V-like message queues
+#options 	SYSVSEM		# System V-like semaphores
+#options 	SEMMNI=10	# number of semaphore identifiers
+#options 	SEMMNS=60	# number of semaphores in system
+#options 	SEMUME=10	# max number of undo entries per process
+#options 	SEMMNU=30	# number of undo structures in system
+#options 	SYSVSHM		# System V-like memory sharing
+#options 	SHMMAXPGS=1024	# 1024 pages is the default
+#options	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
+
+# Device options
+
+options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
+options 	MEMORY_DISK_ROOT_SIZE=8192	# Size in blocks
+options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
+options		MEMORY_RBFLAGS=0
+
+# Console options. The default console is speed is 115200 baud.
+options 	CONSPEED=115200		# Console speed
+options 	CONUNIT=1		# Console port number
+
+# Miscellaneous kernel options
+#options 	KTRACE		# system call tracing, a la ktrace(1)
+#options	SYSTRACE	# system call vetting via systrace(1)
+#options 	IRQSTATS	# manage IRQ statistics
+#options 	LKM		# loadable kernel modules
+#options 	KMEMSTATS	# kernel memory statistics
+#options 	SCSIVERBOSE	# Verbose SCSI errors
+#options 	PCIVERBOSE	# Verbose PCI descriptions
+#options 	MIIVERBOSE	# Verbose MII autoconfuration messages
+#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
+#options 	DDB_KEYCODE=0x40
+#options 	USERCONF	# userconf(4) support
+options		PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
+#options	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
+
+# Development and Debugging options
+
+#options 	PERFCTRS	# performance counters
+#options 	DIAGNOSTIC	# internally consistency checks
+#options 	DEBUG
+#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	IPKDB		# remote kernel debugging
+#options 	VERBOSE_INIT_ARM # verbose bootstraping messages
+#options 	DDB		# in-kernel debugger
+#options	DDB_ONPANIC=1
+#options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
+#makeoptions	DEBUG="-g"	# compile full symbol table
+#options 	SYMTAB_SPACE=450000
+
+#options 	PMAP_INCLUDE_PTE_SYNC
+#options 	LOCKDEBUG
+
+config		netbsd		root on ? type ?
+#config		netbsd		root on epe0 type nfs
+
+# The main bus device
+mainbus0	at root
+
+# The boot cpu
+cpu0		at mainbus?
+
+# Cirrus Logic EP93xx System-on-chip
+epsoc0		at mainbus?
+
+# AHB Peripheral
+# On-chip 10/100 Ethernet
+epe0		at epsoc? addr 0x80010000 size 0x10000 intr 39
+
+# APB Peripheral
+# On-chip timers
+epclk0		at epsoc? addr 0x80810000 size 0x90 intr 4
+# GPIO
+epgpio0		at epsoc? addr 0x80840000 size 0xcc intr 59
+gpio*		at epgpio?
+# On-chip serial UARTS
+epcom0		at epsoc? addr 0x808c0000 size 0x1000 intr 52
+epcom1		at epsoc? addr 0x808d0000 size 0x1000 intr 54
+# RealTime Clock (no battery backup)
+eprtc0		at epsoc? addr 0x80920000 size 0x10c intr 37
+# Watchdog Timer
+epwdog0		at epsoc? addr 0x80940000 size 0x08 intr 36
+# LED
+epled0		at epgpio0 port 4 bit1 1 bit2 0
+
+# I^2C Controller Unit
+armadillo9iic0	at epgpio0 port 1 bit1 4 bit2 5
+iic*		at armadillo9iic?
+seeprom0	at iic? addr 0x50 size 128
+
+# MII/PHY support
+lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
+
+
+# Pseudo-Devices
+
+# disk/mass storage pseudo-devices
+pseudo-device	md		1	# memory disk device (ramdisk)
+pseudo-device	vnd			# disk-like interface to files
+options 	VND_COMPRESSION		# compressed vnd(4)
+#pseudo-device	fss		4	# file system snapshot device
+
+# network pseudo-devices
+pseudo-device	bpfilter		# Berkeley packet filter
+#pseudo-device	ipfilter		# IP filter (firewall) and NAT
+pseudo-device	loop			# network loopback
+#pseudo-device	ppp			# Point-to-Point Protocol
+#pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+#pseudo-device	irframetty		# IrDA frame line discipline
+#pseudo-device	tap			# virtual Ethernet
+#pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	vlan			# IEEE 802.1q encapsulation
+#pseudo-device	bridge			# simple inter-network bridging
+#options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
+#pseudo-device	pf			# PF packet filter
+#pseudo-device	pflog			# PF log if
+#pseudo-device	kttcp			# network loopback
+
+# miscellaneous pseudo-devices
+pseudo-device	pty			# pseudo-terminals
+pseudo-device	rnd			# /dev/random and in-kernel generator
+#options	RND_COM
+pseudo-device	clockctl		# user control of clock subsystem
+#pseudo-device	ksyms			# /dev/ksyms
+#pseudo-device	crypto			# /dev/crypto device
+#pseudo-device	swcrypto		# software crypto implementation
--- a/sys/arch/evbarm/conf/ARMADILLO9	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO9	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: ARMADILLO9,v 1.6 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: ARMADILLO9,v 1.6.4.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	ARMADILLO9 -- Atmark Techno, Armadillo-9
 #
@@ -108,6 +108,7 @@
 
 # Console options. The default console is speed is 115200 baud.
 options 	CONSPEED=115200		# Console speed
+options 	CONUNIT=0		# Console port number
 
 # Miscellaneous kernel options
 options 	KTRACE		# system call tracing, a la ktrace(1)
@@ -271,24 +272,25 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
+options 	VND_COMPRESSION		# compressed vnd(4)
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
-#pseudo-device	ppp		2	# Point-to-Point Protocol
+#pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
 #pseudo-device	irframetty		# IrDA frame line discipline
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	tun		2	# network tunneling over tty
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/evbarm/conf/INTEGRATOR	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/INTEGRATOR	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR,v 1.44 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: INTEGRATOR,v 1.44.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	GENERIC -- ARM Integrator board Generic kernel
 #
@@ -243,11 +243,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-#pseudo-device	bpfilter	4	# Berkeley packet filter
+#pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	loop			# network loopback
 
--- a/sys/arch/evbarm/conf/IQ31244	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/IQ31244	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ31244,v 1.34 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: IQ31244,v 1.34.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	IQ31244 -- Intel IQ31244 Evaluation Board Kernel
 #
@@ -215,11 +215,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp			# network loopback
 
--- a/sys/arch/evbarm/conf/IQ80310	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/IQ80310	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80310,v 1.50 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: IQ80310,v 1.50.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	IQ80310 -- Intel IQ80310 Evaluation Board Kernel
 #
@@ -226,11 +226,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
--- a/sys/arch/evbarm/conf/IQ80321	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/IQ80321	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321,v 1.46 2005/12/14 16:21:55 briggs Exp $
+#	$NetBSD: IQ80321,v 1.46.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	IQ80321 -- Intel IQ80321 Evaluation Board Kernel
 #
@@ -220,11 +220,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp			# network loopback
 
--- a/sys/arch/evbarm/conf/IXDP425	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/IXDP425	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: IXDP425,v 1.16 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: IXDP425,v 1.16.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
 #
@@ -234,10 +234,10 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp			# network loopback
 
--- a/sys/arch/evbarm/conf/IXM1200	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/IXM1200	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: IXM1200,v 1.21 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: IXM1200,v 1.21.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	IXM1200 -- Intel IXM1200 Evaluation Board Kernel
 #
@@ -138,7 +138,7 @@
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=230000
+options 	SYMTAB_SPACE=240000
 
 config		netbsd		root on ? type ?
 
@@ -177,10 +177,10 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-#pseudo-device	bpfilter	4	# Berkeley packet filter
+#pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
--- a/sys/arch/evbarm/conf/LUBBOCK	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/LUBBOCK	Sat Feb 18 15:38:30 2006 +0000
@@ -252,11 +252,11 @@
 
 # disk/mass storage pseudo-devices
 pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
--- a/sys/arch/evbarm/conf/NAPPI	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/NAPPI	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NAPPI,v 1.22 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: NAPPI,v 1.22.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	NAPPI -- Netwise APlication Platform Board Kernel
 #
@@ -174,10 +174,10 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-#pseudo-device	bpfilter	4	# Berkeley packet filter
+#pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
--- a/sys/arch/evbarm/conf/SMDK2410	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/SMDK2410	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: SMDK2410,v 1.26 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: SMDK2410,v 1.26.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	SMDK2410 -- Samsung's S3C2410 evaluation board.
 #
@@ -338,24 +338,24 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-#pseudo-device	bpfilter	8	# Berkeley packet filter
+#pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
-#pseudo-device	ppp		2	# Point-to-Point Protocol
+#pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
 #pseudo-device	irframetty		# IrDA frame line discipline
-#pseudo-device	tun		2	# network tunneling over tty
+#pseudo-device	tun			# network tunneling over tty
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/evbarm/conf/SMDK2800	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/SMDK2800	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: SMDK2800,v 1.29 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: SMDK2800,v 1.29.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	SMDK2800 -- Samsung's S3C2800 evaluation board.
 #
@@ -224,25 +224,25 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 #pseudo-device	kttcp			# network loopback
-#pseudo-device	ppp		2	# Point-to-Point Protocol
+#pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
 #pseudo-device	irframetty		# IrDA frame line discipline
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	tun		2	# network tunneling over tty
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR,v 1.46 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: TEAMASA_NPWR,v 1.46.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
 #	server appliance.
@@ -204,13 +204,13 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 pseudo-device	raid		4	# RAIDframe devices
 #pseudo-device	fss		4	# file system snapshot device
 #pseudo-device	ccd		4	# Concatenated disk devices
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp
 
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR_FC,v 1.15 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: TEAMASA_NPWR_FC,v 1.15.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	TeamASA NPWR-FC, i80321-based SBC
 #
@@ -223,11 +223,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp			# network loopback
 
--- a/sys/arch/evbarm/conf/TS7200	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/TS7200	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: TS7200,v 1.23 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: TS7200,v 1.23.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	GENERIC -- Generic kernel
 #
@@ -426,11 +426,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp			# network loopback
 
--- a/sys/arch/evbarm/conf/TWINTAIL	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/TWINTAIL	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: TWINTAIL,v 1.12 2005/12/17 16:33:30 tsutsui Exp $
+#	$NetBSD: TWINTAIL,v 1.12.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
 #
@@ -363,25 +363,25 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd		4	# disk-like interface to files
+#pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 #pseudo-device	kttcp			# network loopback
-#pseudo-device	ppp		2	# Point-to-Point Protocol
+#pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-#pseudo-device	sl		2	# Serial Line IP
-#pseudo-device	strip		2	# Starmode Radio IP (Metricom)
+#pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
 #pseudo-device	irframetty		# IrDA frame line discipline
 #pseudo-device	tap			# virtual Ethernet
-#pseudo-device	tun		2	# network tunneling over tty
-#pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
-#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+#pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
--- a/sys/arch/evbarm/conf/VIPER	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/VIPER	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: VIPER,v 1.8 2005/12/11 12:17:06 christos Exp $
+#	$NetBSD: VIPER,v 1.8.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	Arcom Viper
 #
@@ -177,11 +177,11 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss		4	# file system snapshot device
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp			# network loopback
 
--- a/sys/arch/evbarm/conf/ZAO425	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/ZAO425	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: ZAO425,v 1.24 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: ZAO425,v 1.24.2.1 2006/02/18 15:38:32 yamt Exp $
 #
 #	ZAO425 -- Intel IXP425
 #
@@ -252,10 +252,10 @@
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md		1	# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	kttcp			# network loopback
 
--- a/sys/arch/evbarm/conf/files.armadillo9	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/files.armadillo9	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: files.armadillo9,v 1.1 2005/11/13 06:33:06 hamajima Exp $
+#	$NetBSD: files.armadillo9,v 1.1.6.1 2006/02/18 15:38:32 yamt Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -12,14 +12,14 @@
 
 attach	epsoc at mainbus
 
-attach	epcom at epsoc with epcom_ts
-file	arch/evbarm/tsarm/epcom_ts.c
+attach	epcom at epsoc with armadillo9com
+file	arch/evbarm/armadillo/armadillo9_com.c	armadillo9com
 
 device	armadillo9iic: i2cbus, i2c_bitbang
 attach	armadillo9iic at epgpio
 file	arch/evbarm/armadillo/armadillo9_iic.c	armadillo9iic
 
 attach	eppcic at epsoc with armadillo9pcic
-file	arch/evbarm/armadillo/armadillo9_pcic.c
+file	arch/evbarm/armadillo/armadillo9_pcic.c	armadillo9pcic
 
 include	"dev/pcmcia/files.pcmcia"
--- a/sys/arch/evbarm/conf/std.armadillo9	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/conf/std.armadillo9	Sat Feb 18 15:38:30 2006 +0000
@@ -1,11 +1,11 @@
-#	$NetBSD: std.armadillo9,v 1.1 2005/11/13 06:33:06 hamajima Exp $
+#	$NetBSD: std.armadillo9,v 1.1.6.1 2006/02/18 15:38:32 yamt Exp $
 #
 # standard NetBSD/evbarm for Armadillo9 options
 
 machine	evbarm arm
 include		"conf/std"	# MI standard options
 
-# Pull in tsarm config definitions.
+# Pull in armadillo9 config definitions.
 include "arch/evbarm/conf/files.armadillo9"
 
 
--- a/sys/arch/evbarm/include/bootconfig.h	Sat Feb 18 14:52:24 2006 +0000
+++ b/sys/arch/evbarm/include/bootconfig.h	Sat Feb 18 15:38:30 2006 +0000
@@ -1,4 +1,4 @@