sync with head. yamt-pdpolicy
authoryamt <yamt@NetBSD.org>
Wed, 24 May 2006 10:56:32 +0000
branchyamt-pdpolicy
changeset 288360 ae77815e8fa0
parent 288359 53a18c641132
child 288361 dd1f173d461a
sync with head.
sys/altq/altq_afmap.c
sys/altq/altq_blue.c
sys/altq/altq_cbq.c
sys/altq/altq_cdnr.c
sys/altq/altq_conf.c
sys/altq/altq_fifoq.c
sys/altq/altq_hfsc.c
sys/altq/altq_priq.c
sys/altq/altq_red.c
sys/altq/altq_rio.c
sys/altq/altq_rmclass.c
sys/altq/altq_subr.c
sys/altq/altq_wfq.c
sys/arch/acorn26/acorn26/vm_machdep.c
sys/arch/acorn26/vidc/arcvideo.c
sys/arch/acorn32/mainbus/fd.c
sys/arch/algor/algor/algor_p4032_intr.c
sys/arch/algor/algor/algor_p5064_intr.c
sys/arch/algor/algor/algor_p6032_intr.c
sys/arch/algor/algor/autoconf.c
sys/arch/algor/algor/interrupt.c
sys/arch/algor/conf/files.algor
sys/arch/algor/include/intr.h
sys/arch/algor/pci/pcib.c
sys/arch/alpha/a12/a12dc.c
sys/arch/alpha/alpha/fp_complete.c
sys/arch/alpha/alpha/pmap.c
sys/arch/alpha/alpha/promcons.c
sys/arch/alpha/alpha/trap.c
sys/arch/alpha/alpha/vm_machdep.c
sys/arch/alpha/conf/GENERIC
sys/arch/alpha/include/db_machdep.h
sys/arch/alpha/pci/dwlpxreg.h
sys/arch/alpha/pci/mcpciareg.h
sys/arch/amd64/amd64/fpu.c
sys/arch/amd64/amd64/locore.S
sys/arch/amd64/amd64/mem.c
sys/arch/amd64/amd64/netbsd32_machdep.c
sys/arch/amd64/amd64/pmap.c
sys/arch/amd64/amd64/sys_machdep.c
sys/arch/amd64/amd64/trap.c
sys/arch/amd64/amd64/vm_machdep.c
sys/arch/amd64/conf/GENERIC
sys/arch/amd64/conf/INSTALL
sys/arch/amd64/include/userret.h
sys/arch/amiga/amiga/trap.c
sys/arch/amiga/dev/amidisplaycc.c
sys/arch/amiga/dev/if_qn.c
sys/arch/amiga/dev/ite.c
sys/arch/amiga/dev/mfc.c
sys/arch/amiga/dev/msc.c
sys/arch/amiga/dev/ser.c
sys/arch/arc/arc/cpu.c
sys/arch/arc/conf/GENERIC
sys/arch/arc/conf/PCCONS
sys/arch/arc/conf/RAMDISK
sys/arch/arc/dev/opms.c
sys/arch/arc/dev/pccons.c
sys/arch/arc/dti/tyneisabr.c
sys/arch/arc/include/pci_machdep.h
sys/arch/arc/isa/arcsisabr.c
sys/arch/arc/jazz/asc.c
sys/arch/arc/jazz/fd.c
sys/arch/arc/jazz/jazzio.c
sys/arch/arc/jazz/jazzisabr.c
sys/arch/arc/jazz/oosiop_jazzio.c
sys/arch/arc/pci/necpb.c
sys/arch/arm/arm/sig_machdep.c
sys/arch/arm/arm32/cpuswitch.S
sys/arch/arm/arm32/fault.c
sys/arch/arm/arm32/mem.c
sys/arch/arm/arm32/vm_machdep.c
sys/arch/arm/ep93xx/epcom.c
sys/arch/arm/ep93xx/epe.c
sys/arch/arm/footbridge/footbridge_clock.c
sys/arch/arm/footbridge/footbridge_com.c
sys/arch/arm/footbridge/footbridge_intr.h
sys/arch/arm/footbridge/footbridge_irqhandler.c
sys/arch/arm/include/armreg.h
sys/arch/arm/include/db_machdep.h
sys/arch/arm/iomd/console/console.c
sys/arch/arm/iomd/iomd_irqhandler.c
sys/arch/arm/iomd/rpckbd.c
sys/arch/arm/iomd/vidcvideo.c
sys/arch/arm/ixp12x0/ixp12x0_com.c
sys/arch/arm/ofw/ofw_irqhandler.c
sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
sys/arch/arm/s3c2xx0/s3c24x0_lcd.h
sys/arch/arm/s3c2xx0/sscom.c
sys/arch/arm/sa11x0/sa11x0.c
sys/arch/arm/sa11x0/sa11x0_com.c
sys/arch/arm/sa11x0/sa11x0_comreg.h
sys/arch/arm/sa11x0/sa11x0_comvar.h
sys/arch/arm/sa11x0/sa11x0_dmacreg.h
sys/arch/arm/sa11x0/sa11x0_io.c
sys/arch/arm/sa11x0/sa11x0_irqhandler.c
sys/arch/arm/sa11x0/sa11x0_ost.c
sys/arch/arm/sa11x0/sa11x0_ppcreg.h
sys/arch/arm/sa11x0/sa11x0_reg.h
sys/arch/arm/sa11x0/sa11x0_sspreg.h
sys/arch/arm/sa11x0/sa11x0_var.h
sys/arch/arm/xscale/i80321_icu.c
sys/arch/arm/xscale/ixp425_intr.c
sys/arch/arm/xscale/pxa2x0_lcd.c
sys/arch/arm/xscale/pxa2x0_lcd.h
sys/arch/arm/xscale/xscale_pmc.c
sys/arch/atari/atari/trap.c
sys/arch/atari/conf/MILAN.in
sys/arch/atari/dev/atari5380.c
sys/arch/atari/dev/hdfd.c
sys/arch/atari/dev/ite.c
sys/arch/atari/dev/ser.c
sys/arch/atari/dev/zs.c
sys/arch/bebox/isa/pccons.c
sys/arch/bebox/pci/pfb.c
sys/arch/cats/conf/GENERIC
sys/arch/cesfic/cesfic/trap.c
sys/arch/cobalt/cobalt/autoconf.c
sys/arch/cobalt/cobalt/bus.c
sys/arch/cobalt/cobalt/clock.c
sys/arch/cobalt/cobalt/clockvar.h
sys/arch/cobalt/cobalt/machdep.c
sys/arch/cobalt/conf/GENERIC
sys/arch/cobalt/conf/INSTALL
sys/arch/cobalt/conf/files.cobalt
sys/arch/cobalt/dev/com_mainbus.c
sys/arch/cobalt/dev/gt.c
sys/arch/cobalt/dev/gtreg.h
sys/arch/cobalt/dev/mcclock.c
sys/arch/cobalt/include/bootinfo.h
sys/arch/cobalt/include/bus.h
sys/arch/cobalt/include/cpu.h
sys/arch/cobalt/include/intr.h
sys/arch/cobalt/include/param.h
sys/arch/cobalt/include/pci_machdep.h
sys/arch/cobalt/pci/pci_machdep.c
sys/arch/cobalt/pci/pcib.c
sys/arch/dreamcast/conf/GENERIC
sys/arch/dreamcast/dev/g2/aica.c
sys/arch/dreamcast/dev/pvr.c
sys/arch/evbarm/adi_brh/brh_machdep.c
sys/arch/evbarm/armadillo/armadillo9_machdep.c
sys/arch/evbarm/conf/ADI_BRH
sys/arch/evbarm/conf/ARMADILLO9
sys/arch/evbarm/conf/HDL_G
sys/arch/evbarm/conf/IQ80310
sys/arch/evbarm/conf/TS7200
sys/arch/evbarm/conf/files.hdl_g
sys/arch/evbarm/conf/mk.hdl_g
sys/arch/evbarm/conf/std.hdl_g
sys/arch/evbarm/dev/plcom.c
sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
sys/arch/evbarm/hdl_g/btn_obio.c
sys/arch/evbarm/hdl_g/com_obio.c
sys/arch/evbarm/hdl_g/hdlg_machdep.c
sys/arch/evbarm/hdl_g/hdlg_pci.c
sys/arch/evbarm/hdl_g/hdlg_start.S
sys/arch/evbarm/hdl_g/hdlgreg.h
sys/arch/evbarm/hdl_g/hdlgvar.h
sys/arch/evbarm/hdl_g/i80321_mainbus.c
sys/arch/evbarm/hdl_g/obio.c
sys/arch/evbarm/hdl_g/obio_space.c
sys/arch/evbarm/hdl_g/obiovar.h
sys/arch/evbarm/ifpga/ifpga_intr.c
sys/arch/evbarm/ifpga/ifpga_intr.h
sys/arch/evbarm/integrator/integrator_machdep.c
sys/arch/evbarm/iq80310/iq80310_machdep.c
sys/arch/evbarm/iq80321/iq80321_machdep.c
sys/arch/evbarm/ixdp425/ixdp425_machdep.c
sys/arch/evbarm/ixm1200/ixm1200_machdep.c
sys/arch/evbarm/lubbock/lubbock_lcd.c
sys/arch/evbarm/lubbock/lubbock_machdep.c
sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
sys/arch/evbarm/nslu2/README
sys/arch/evbarm/nslu2/nslu2_leds.c
sys/arch/evbarm/nslu2/nslu2_machdep.c
sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
sys/arch/evbarm/tsarm/tsarm_machdep.c
sys/arch/evbarm/viper/viper_machdep.c
sys/arch/evbarm/viper/viper_start.S
sys/arch/evbmips/alchemy/autoconf.c
sys/arch/evbmips/alchemy/dbau1500reg.h
sys/arch/evbmips/atheros/autoconf.c
sys/arch/evbmips/conf/ALCHEMY
sys/arch/evbmips/conf/AR531X
sys/arch/evbmips/conf/MALTA
sys/arch/evbmips/malta/pci/pcib.c
sys/arch/evbppc/conf/EXPLORA451
sys/arch/evbppc/conf/files.obs200
sys/arch/evbppc/conf/files.obs405
sys/arch/evbppc/explora/dev/fb_elb.c
sys/arch/evbppc/explora/machdep.c
sys/arch/evbppc/obs405/dev/century_bios.c
sys/arch/evbppc/obs405/obs200_autoconf.c
sys/arch/evbppc/obs405/obs266_autoconf.c
sys/arch/evbppc/walnut/autoconf.c
sys/arch/evbppc/walnut/dev/pbus.c
sys/arch/evbppc/walnut/machdep.c
sys/arch/ews4800mips/ews4800mips/bus_dma.c
sys/arch/ews4800mips/include/bus.h
sys/arch/ews4800mips/sbd/fb_sbdio.c
sys/arch/hp300/dev/dcm.c
sys/arch/hp300/dev/hil.c
sys/arch/hp300/dev/ite.c
sys/arch/hp300/dev/rd.c
sys/arch/hp300/hp300/trap.c
sys/arch/hp700/conf/GENERIC
sys/arch/hp700/dev/pdc.c
sys/arch/hpc/hpc/platid.c
sys/arch/hpcarm/conf/IPAQ
sys/arch/hpcarm/conf/JORNADA720
sys/arch/hpcarm/conf/JORNADA820
sys/arch/hpcarm/conf/files.hpcarm
sys/arch/hpcarm/conf/majors.hpcarm
sys/arch/hpcarm/dev/ipaq_saip.c
sys/arch/hpcarm/dev/ipaq_saipvar.h
sys/arch/hpcarm/hpcarm/hpc_machdep.c
sys/arch/hpcmips/dev/optpoint.c
sys/arch/hpcmips/hpcmips/bus_dma.c
sys/arch/hpcmips/tx/txcom.c
sys/arch/hpcsh/dev/j6x0tp.c
sys/arch/hppa/hppa/trap.c
sys/arch/i386/bios/vesabios.c
sys/arch/i386/bios/vesafb.c
sys/arch/i386/bios/vesafbvar.h
sys/arch/i386/conf/GENERIC
sys/arch/i386/conf/GENERIC_LAPTOP
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/IOPENER
sys/arch/i386/conf/LAMB
sys/arch/i386/conf/SWINGER
sys/arch/i386/conf/VIRTUALPC
sys/arch/i386/conf/XEN0
sys/arch/i386/conf/files.i386
sys/arch/i386/i386/genassym.cf
sys/arch/i386/i386/kvm86call.S
sys/arch/i386/i386/locore.S
sys/arch/i386/i386/machdep.c
sys/arch/i386/i386/pmap.c
sys/arch/i386/i386/sys_machdep.c
sys/arch/i386/i386/trap.c
sys/arch/i386/i386/vm_machdep.c
sys/arch/i386/include/npx.h
sys/arch/i386/include/param.h
sys/arch/i386/include/pcb.h
sys/arch/i386/include/proc.h
sys/arch/i386/include/sysarch.h
sys/arch/i386/include/userret.h
sys/arch/i386/isa/npx.c
sys/arch/i386/isa/pccons.c
sys/arch/i386/pci/pci_intr_fixup.c
sys/arch/i386/pci/piixpcib.c
sys/arch/i386/pci/via8231.c
sys/arch/i386/stand/Makefile.booters
sys/arch/i386/stand/Makefile.inc
sys/arch/i386/stand/boot/Makefile.boot
sys/arch/i386/stand/bootxx/Makefile.bootxx
sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile
sys/arch/i386/stand/cdboot/Makefile
sys/arch/i386/stand/lib/dosfile.c
sys/arch/i386/stand/lib/netif/3c509.c
sys/arch/i386/stand/lib/netif/3c590.c
sys/arch/i386/stand/lib/netif/3c90xb.c
sys/arch/i386/stand/mbr/Makefile.mbr
sys/arch/i386/stand/pxeboot/Makefile
sys/arch/i386/stand/pxeboot/pxe.c
sys/arch/ia64/stand/common/bcache.c
sys/arch/ia64/stand/common/bitstring.h
sys/arch/ia64/stand/common/boot.c
sys/arch/ia64/stand/common/bootstrap.h
sys/arch/ia64/stand/common/commands.c
sys/arch/ia64/stand/common/console.c
sys/arch/ia64/stand/common/dev_net.c
sys/arch/ia64/stand/common/dev_net.h
sys/arch/ia64/stand/common/devopen.c
sys/arch/ia64/stand/common/interp.c
sys/arch/ia64/stand/common/interp_backslash.c
sys/arch/ia64/stand/common/interp_parse.c
sys/arch/ia64/stand/common/load_elf64.c
sys/arch/ia64/stand/common/ls.c
sys/arch/ia64/stand/common/merge_help.awk
sys/arch/ia64/stand/common/misc.c
sys/arch/ia64/stand/common/newvers.sh
sys/arch/ia64/stand/common/panic.c
sys/arch/ia64/stand/efi/include/README
sys/arch/ia64/stand/efi/include/efi.h
sys/arch/ia64/stand/efi/include/efi_nii.h
sys/arch/ia64/stand/efi/include/efiapi.h
sys/arch/ia64/stand/efi/include/eficon.h
sys/arch/ia64/stand/efi/include/efidebug.h
sys/arch/ia64/stand/efi/include/efidef.h
sys/arch/ia64/stand/efi/include/efidevp.h
sys/arch/ia64/stand/efi/include/efierr.h
sys/arch/ia64/stand/efi/include/efifpswa.h
sys/arch/ia64/stand/efi/include/efifs.h
sys/arch/ia64/stand/efi/include/efilib.h
sys/arch/ia64/stand/efi/include/efinet.h
sys/arch/ia64/stand/efi/include/efipart.h
sys/arch/ia64/stand/efi/include/efiprot.h
sys/arch/ia64/stand/efi/include/efipxebc.h
sys/arch/ia64/stand/efi/include/efiser.h
sys/arch/ia64/stand/efi/include/efistdarg.h
sys/arch/ia64/stand/efi/include/ia64/efibind.h
sys/arch/ia64/stand/efi/include/ia64/pe.h
sys/arch/ia64/stand/efi/libefi/bootinfo.c
sys/arch/ia64/stand/efi/libefi/copy.c
sys/arch/ia64/stand/efi/libefi/delay.c
sys/arch/ia64/stand/efi/libefi/devicename.c
sys/arch/ia64/stand/efi/libefi/efi.c
sys/arch/ia64/stand/efi/libefi/efi_console.c
sys/arch/ia64/stand/efi/libefi/efiboot.h
sys/arch/ia64/stand/efi/libefi/efifpswa.c
sys/arch/ia64/stand/efi/libefi/efifs.c
sys/arch/ia64/stand/efi/libefi/efifs_ls.c
sys/arch/ia64/stand/efi/libefi/efinet.c
sys/arch/ia64/stand/efi/libefi/exec.c
sys/arch/ia64/stand/efi/libefi/module.c
sys/arch/ia64/stand/efi/libefi/time.c
sys/arch/ia64/stand/ia64/efi/conf.c
sys/arch/ia64/stand/ia64/efi/ldscript.ia64
sys/arch/ia64/stand/ia64/efi/start.S
sys/arch/ia64/stand/ia64/efi/version
sys/arch/ia64/stand/ia64/ski/acpi_stub.c
sys/arch/ia64/stand/ia64/ski/bootinfo.c
sys/arch/ia64/stand/ia64/ski/copy.c
sys/arch/ia64/stand/ia64/ski/delay.c
sys/arch/ia64/stand/ia64/ski/devicename.c
sys/arch/ia64/stand/ia64/ski/efi_stub.c
sys/arch/ia64/stand/ia64/ski/exec.c
sys/arch/ia64/stand/ia64/ski/exit.c
sys/arch/ia64/stand/ia64/ski/libski.h
sys/arch/ia64/stand/ia64/ski/pal_stub.S
sys/arch/ia64/stand/ia64/ski/sal_stub.c
sys/arch/ia64/stand/ia64/ski/skiconsole.c
sys/arch/ia64/stand/ia64/ski/skifs.c
sys/arch/ia64/stand/ia64/ski/ssc.c
sys/arch/ia64/stand/ia64/ski/start.S
sys/arch/ia64/stand/ia64/ski/time.c
sys/arch/ia64/stand/ia64/ski/version
sys/arch/ibmnws/conf/GENERIC
sys/arch/ibmnws/conf/files.ibmnws
sys/arch/ibmnws/conf/majors.ibmnws
sys/arch/ibmnws/conf/std.ibmnws
sys/arch/ibmnws/ibmnws/autoconf.c
sys/arch/ibmnws/ibmnws/clock.c
sys/arch/ibmnws/ibmnws/clockvar.h
sys/arch/ibmnws/ibmnws/cpu.c
sys/arch/ibmnws/ibmnws/extintr.c
sys/arch/ibmnws/ibmnws/locore.S
sys/arch/ibmnws/ibmnws/machdep.c
sys/arch/ibmnws/ibmnws/mainbus.c
sys/arch/ibmnws/include/autoconf.h
sys/arch/ibmnws/include/intr.h
sys/arch/ibmnws/include/powerpc.h
sys/arch/ibmnws/include/types.h
sys/arch/iyonix/iyonix/autoconf.c
sys/arch/iyonix/iyonix/i80321_mainbus.c
sys/arch/luna68k/dev/lunafb.c
sys/arch/luna68k/dev/siotty.c
sys/arch/luna68k/luna68k/trap.c
sys/arch/m68k/include/Makefile
sys/arch/m68k/m68k/svr4_machdep.c
sys/arch/m68k/m68k/switch_subr.s
sys/arch/mac68k/dev/macfb.c
sys/arch/mac68k/dev/sbc.c
sys/arch/mac68k/mac68k/trap.c
sys/arch/macppc/dev/ofb.c
sys/arch/macppc/dev/ofcons.c
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/dev/aucom.c
sys/arch/mips/alchemy/dev/if_aumac.c
sys/arch/mips/atheros/arbus.c
sys/arch/mips/atheros/dev/flash_arbus.c
sys/arch/mips/atheros/dev/if_ae.c
sys/arch/mips/include/cpuregs.h
sys/arch/mips/mips/cpu_exec.c
sys/arch/mips/mips/db_interface.c
sys/arch/mips/mips/locore.S
sys/arch/mips/mips/trap.c
sys/arch/mips/sibyte/dev/sbjcn.c
sys/arch/mips/sibyte/dev/sbscn.c
sys/arch/mvme68k/conf/VME177
sys/arch/mvme68k/mvme68k/trap.c
sys/arch/mvme68k/stand/bootst/rawfs.c
sys/arch/mvme68k/stand/bootxx/bootxx.c
sys/arch/mvme68k/stand/sboot/etherfun.c
sys/arch/mvme68k/stand/sboot/etherfun.h
sys/arch/mvmeppc/conf/MVME1600
sys/arch/news68k/news68k/trap.c
sys/arch/newsmips/apbus/xafb.c
sys/arch/newsmips/dev/fb.c
sys/arch/newsmips/newsmips/bus.c
sys/arch/next68k/dev/nextdisplay.c
sys/arch/next68k/next68k/trap.c
sys/arch/pc532/conf/std.pc532
sys/arch/pc532/dev/aic.c
sys/arch/pc532/dev/lpt.c
sys/arch/pc532/dev/ncr.c
sys/arch/pc532/dev/scn.c
sys/arch/pc532/dev/scnvar.h
sys/arch/pc532/fpu/README
sys/arch/pc532/fpu/ieee_dze.c
sys/arch/pc532/fpu/ieee_handler.c
sys/arch/pc532/fpu/ieee_handler.h
sys/arch/pc532/fpu/ieee_internal.h
sys/arch/pc532/fpu/ieee_invop.c
sys/arch/pc532/fpu/ieee_ovfl.c
sys/arch/pc532/fpu/ieee_subnormal.c
sys/arch/pc532/include/Makefile
sys/arch/pc532/include/asm.h
sys/arch/pc532/include/cpu.h
sys/arch/pc532/include/db_machdep.h
sys/arch/pc532/include/ieeefp.h
sys/arch/pc532/include/intr.h
sys/arch/pc532/include/kcore.h
sys/arch/pc532/include/lock.h
sys/arch/pc532/include/mtpr.h
sys/arch/pc532/include/param.h
sys/arch/pc532/include/pmap.h
sys/arch/pc532/include/profile.h
sys/arch/pc532/include/pte.h
sys/arch/pc532/include/reg.h
sys/arch/pc532/include/userret.h
sys/arch/pc532/include/varargs.h
sys/arch/pc532/include/vmparam.h
sys/arch/pc532/pc532/autoconf.c
sys/arch/pc532/pc532/clock.c
sys/arch/pc532/pc532/db_disasm.c
sys/arch/pc532/pc532/db_interface.c
sys/arch/pc532/pc532/db_memrw.c
sys/arch/pc532/pc532/db_trace.c
sys/arch/pc532/pc532/disksubr.c
sys/arch/pc532/pc532/genassym.cf
sys/arch/pc532/pc532/in_cksum.c
sys/arch/pc532/pc532/intr.c
sys/arch/pc532/pc532/kgdb_machdep.c
sys/arch/pc532/pc532/locore.s
sys/arch/pc532/pc532/machdep.c
sys/arch/pc532/pc532/mainbus.c
sys/arch/pc532/pc532/mem.c
sys/arch/pc532/pc532/pmap.c
sys/arch/pc532/pc532/process_machdep.c
sys/arch/pc532/pc532/procfs_machdep.c
sys/arch/pc532/pc532/sys_machdep.c
sys/arch/pc532/pc532/syscall.c
sys/arch/pc532/pc532/trap.c
sys/arch/pc532/pc532/umprintf.c
sys/arch/pc532/pc532/vm_machdep.c
sys/arch/pc532/stand/common/devopen.c
sys/arch/pc532/stand/common/scsi_hi.c
sys/arch/pc532/stand/common/scsi_low.c
sys/arch/pc532/stand/common/sd.c
sys/arch/pdp10/dev/hp.c
sys/arch/playstation2/ee/gsfb.c
sys/arch/playstation2/playstation2/bus_dma.c
sys/arch/pmax/dev/dc.c
sys/arch/pmax/dev/dtop.c
sys/arch/pmax/dev/rcons.c
sys/arch/pmax/ibus/pm.c
sys/arch/pmax/pmax/bus_dma.c
sys/arch/pmax/pmax/machdep.c
sys/arch/pmax/tc/scc.c
sys/arch/pmppc/conf/PMPPC
sys/arch/powerpc/ibm4xx/board_prop.c
sys/arch/powerpc/ibm4xx/clock.c
sys/arch/powerpc/ibm4xx/cpu.c
sys/arch/powerpc/ibm4xx/dev/com_opb.c
sys/arch/powerpc/ibm4xx/dev/ecc_plb.c
sys/arch/powerpc/ibm4xx/dev/if_emac.c
sys/arch/powerpc/ibm4xx/dev/wdog.c
sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
sys/arch/powerpc/ibm4xx/ibm4xxgpx_autoconf.c
sys/arch/powerpc/ibm4xx/openbios/openbios.c
sys/arch/powerpc/ibm4xx/trap.c
sys/arch/powerpc/include/ibm4xx/cpu.h
sys/arch/powerpc/oea/pmap.c
sys/arch/powerpc/powerpc/mem.c
sys/arch/powerpc/powerpc/softintr.c
sys/arch/powerpc/powerpc/trap.c
sys/arch/prep/conf/GENERIC
sys/arch/prep/conf/GENERIC.local
sys/arch/prep/conf/INSTALL
sys/arch/prep/conf/INSTALL.local
sys/arch/prep/conf/files.prep
sys/arch/prep/conf/std.prep
sys/arch/prep/include/autoconf.h
sys/arch/prep/include/bootinfo.h
sys/arch/prep/include/intr.h
sys/arch/prep/include/powerpc.h
sys/arch/prep/include/types.h
sys/arch/prep/isa/isa_machdep.c
sys/arch/prep/pci/gten.c
sys/arch/prep/pci/pci_machdep.c
sys/arch/prep/pnpbus/nvram_pnpbus.c
sys/arch/prep/pnpbus/pnpbus.c
sys/arch/prep/pnpbus/wdc_pnpbus.c
sys/arch/prep/prep/autoconf.c
sys/arch/prep/prep/clock.c
sys/arch/prep/prep/cpu.c
sys/arch/prep/prep/disksubr.c
sys/arch/prep/prep/extintr.c
sys/arch/prep/prep/locore.S
sys/arch/prep/prep/machdep.c
sys/arch/prep/prep/mainbus.c
sys/arch/prep/prep/platform.c
sys/arch/prep/stand/Makefile
sys/arch/prep/stand/boot/Makefile
sys/arch/prep/stand/boot/boot.c
sys/arch/prep/stand/boot/boot.h
sys/arch/prep/stand/boot/cons.c
sys/arch/prep/stand/boot/filesystem.c
sys/arch/prep/stand/boot/io.c
sys/arch/prep/stand/boot/version
sys/arch/prep/stand/boot/vreset.c
sys/arch/prep/stand/mkbootimage/mkbootimage.c
sys/arch/sandpoint/conf/GENERIC.sandpoint
sys/arch/sbmips/stand/netboot/getsecs.c
sys/arch/sgimips/conf/GENERIC32_IP2x
sys/arch/sgimips/conf/GENERIC32_IP3x
sys/arch/sgimips/gio/grtwo.c
sys/arch/sgimips/gio/newport.c
sys/arch/sgimips/include/bus.h
sys/arch/sgimips/include/pci_machdep.h
sys/arch/sgimips/mace/pci_mace.c
sys/arch/sgimips/pci/pci_machdep.c
sys/arch/sgimips/sgimips/autoconf.c
sys/arch/sgimips/sgimips/bus.c
sys/arch/sgimips/sgimips/locore_machdep.S
sys/arch/sgimips/stand/sgivol/sgivol.c
sys/arch/sh3/dev/sci.c
sys/arch/sh3/dev/scif.c
sys/arch/sh3/include/Makefile
sys/arch/sh3/include/ansi.h
sys/arch/sh3/include/db_machdep.h
sys/arch/sh3/include/stdarg.h
sys/arch/sh3/include/va-sh.h
sys/arch/sh3/include/varargs.h
sys/arch/sh3/sh3/coff_exec.c
sys/arch/sh3/sh3/in_cksum.S
sys/arch/sh3/sh3/mem.c
sys/arch/sh3/sh3/vm_machdep.c
sys/arch/sh5/dev/scif.c
sys/arch/sh5/include/int_fmtio.h
sys/arch/sh5/sh5/mem.c
sys/arch/sh5/sh5/trap.c
sys/arch/shark/conf/GENERIC
sys/arch/shark/isa/isa_irqhandler.c
sys/arch/shark/shark/pccons.c
sys/arch/sparc/conf/KRUPS
sys/arch/sparc/dev/fd.c
sys/arch/sparc/dev/kd.c
sys/arch/sparc/dev/tctrl.c
sys/arch/sparc/include/intr.h
sys/arch/sparc/include/psl.h
sys/arch/sparc/sparc/emul.c
sys/arch/sparc/sparc/locore.s
sys/arch/sparc/sparc/openfirm.c
sys/arch/sparc/sparc/promlib.c
sys/arch/sparc/sparc/trap.c
sys/arch/sparc/stand/common/promdev.c
sys/arch/sparc/stand/ofwboot/ofdev.c
sys/arch/sparc64/conf/GENERIC32
sys/arch/sparc64/dev/ffb.c
sys/arch/sparc64/dev/kd.c
sys/arch/sparc64/dev/pcons.c
sys/arch/sparc64/dev/power.c
sys/arch/sparc64/dev/power.h
sys/arch/sparc64/dev/sab.c
sys/arch/sparc64/include/intr.h
sys/arch/sparc64/include/psl.h
sys/arch/sparc64/sparc64/db_interface.c
sys/arch/sparc64/sparc64/emul.c
sys/arch/sparc64/sparc64/locore.s
sys/arch/sparc64/sparc64/netbsd32_machdep.c
sys/arch/sparc64/sparc64/trap.c
sys/arch/sun2/dev/kd.c
sys/arch/sun2/dev/pcons.c
sys/arch/sun2/sun2/trap.c
sys/arch/sun3/dev/fd.c
sys/arch/sun3/dev/kd.c
sys/arch/sun3/dev/xd.c
sys/arch/sun3/dev/xy.c
sys/arch/sun3/sun3/trap.c
sys/arch/sun3/sun3x/pmap.c
sys/arch/vax/include/pmap.h
sys/arch/vax/mba/hp.c
sys/arch/vax/vax/gencons.c
sys/arch/vax/vax/mem.c
sys/arch/vax/vax/trap.c
sys/arch/vax/vsa/lcspx.c
sys/arch/vax/vsa/smg.c
sys/arch/x68k/dev/com.c
sys/arch/x68k/dev/fd.c
sys/arch/x68k/dev/ite.c
sys/arch/x68k/stand/libsa/devopen.c
sys/arch/x68k/x68k/trap.c
sys/arch/x86/x86/consinit.c
sys/arch/x86/x86/i8259.c
sys/arch/x86/x86/x86_autoconf.c
sys/arch/xen/conf/files.xen
sys/arch/xen/i386/autoconf.c
sys/arch/xen/i386/genassym.cf
sys/arch/xen/i386/locore.S
sys/arch/xen/i386/machdep.c
sys/arch/xen/i386/npx.c
sys/arch/xen/i386/pmap.c
sys/arch/xen/i386/sys_machdep.c
sys/arch/xen/i386/trap.c
sys/arch/xen/include/intr.h
sys/arch/xen/include/xbdvar.h
sys/arch/xen/include/xen3-public/arch-ia64.h
sys/arch/xen/include/xen3-public/arch-x86_32.h
sys/arch/xen/include/xen3-public/arch-x86_64.h
sys/arch/xen/include/xen3-public/dom0_ops.h
sys/arch/xen/include/xen3-public/event_channel.h
sys/arch/xen/include/xen3-public/features.h
sys/arch/xen/include/xen3-public/grant_table.h
sys/arch/xen/include/xen3-public/hvm/hvm_info_table.h
sys/arch/xen/include/xen3-public/hvm/vmx_assist.h
sys/arch/xen/include/xen3-public/io/netif.h
sys/arch/xen/include/xen3-public/io/pciif.h
sys/arch/xen/include/xen3-public/io/ring.h
sys/arch/xen/include/xen3-public/io/tpmif.h
sys/arch/xen/include/xen3-public/io/xenbus.h
sys/arch/xen/include/xen3-public/io/xs_wire.h
sys/arch/xen/include/xen3-public/memory.h
sys/arch/xen/include/xen3-public/nmi.h
sys/arch/xen/include/xen3-public/physdev.h
sys/arch/xen/include/xen3-public/sched.h
sys/arch/xen/include/xen3-public/sched_ctl.h
sys/arch/xen/include/xen3-public/trace.h
sys/arch/xen/include/xen3-public/vcpu.h
sys/arch/xen/include/xen3-public/version.h
sys/arch/xen/include/xen3-public/xen-compat.h
sys/arch/xen/include/xen3-public/xen.h
sys/arch/xen/include/xenbus.h
sys/arch/xen/include/xenio3.h
sys/arch/xen/xen/clock.c
sys/arch/xen/xen/if_xennet.c
sys/arch/xen/xen/if_xennet_xenbus.c
sys/arch/xen/xen/pci_machdep.c
sys/arch/xen/xen/privcmd.c
sys/arch/xen/xen/xbd.c
sys/arch/xen/xen/xbd_xenbus.c
sys/arch/xen/xen/xbdback.c
sys/arch/xen/xen/xencons.c
sys/arch/xen/xen/xenevt.c
sys/arch/xen/xen/xennetback.c
sys/arch/xen/xen/xennetback_xenbus.c
sys/arch/xen/xenbus/xenbus_comms.c
sys/arch/xen/xenbus/xenbus_dev.c
sys/arch/xen/xenbus/xenbus_probe.c
sys/coda/coda_namecache.c
sys/coda/coda_namecache.h
sys/coda/coda_venus.c
sys/coda/coda_venus.h
sys/coda/coda_vfsops.c
sys/coda/coda_vfsops.h
sys/coda/coda_vnops.c
sys/coda/coda_vnops.h
sys/compat/aoutm68k/Makefile
sys/compat/aoutm68k/aoutm68k_stat.c
sys/compat/aoutm68k/aoutm68k_syscall.h
sys/compat/aoutm68k/aoutm68k_syscallargs.h
sys/compat/aoutm68k/aoutm68k_syscalls.c
sys/compat/aoutm68k/aoutm68k_sysent.c
sys/compat/aoutm68k/syscalls.master
sys/compat/common/compat_util.c
sys/compat/common/kern_info_43.c
sys/compat/common/kern_sig_43.c
sys/compat/common/kern_xxx_12.c
sys/compat/common/vfs_syscalls_20.c
sys/compat/common/vfs_syscalls_30.c
sys/compat/darwin/darwin_attr.c
sys/compat/darwin/darwin_sysctl.c
sys/compat/freebsd/freebsd_sched.c
sys/compat/freebsd/freebsd_syscall.h
sys/compat/freebsd/freebsd_syscallargs.h
sys/compat/freebsd/freebsd_syscalls.c
sys/compat/freebsd/freebsd_sysent.c
sys/compat/freebsd/syscalls.master
sys/compat/hpux/hpux_compat.c
sys/compat/ibcs2/ibcs2_exec_coff.c
sys/compat/ibcs2/ibcs2_exec_xout.c
sys/compat/ibcs2/ibcs2_fcntl.c
sys/compat/ibcs2/ibcs2_misc.c
sys/compat/irix/irix_fcntl.c
sys/compat/irix/irix_ioctl.c
sys/compat/irix/irix_mman.c
sys/compat/irix/irix_mount.c
sys/compat/irix/irix_prctl.c
sys/compat/irix/irix_usema.c
sys/compat/linux/arch/alpha/linux_machdep.c
sys/compat/linux/arch/amd64/linux_exec_machdep.c
sys/compat/linux/arch/arm/linux_sys_machdep.c
sys/compat/linux/arch/i386/linux_machdep.c
sys/compat/linux/arch/m68k/linux_machdep.c
sys/compat/linux/arch/mips/linux_machdep.c
sys/compat/linux/arch/powerpc/linux_exec_powerpc.c
sys/compat/linux/common/linux_exec_elf32.c
sys/compat/linux/common/linux_file.c
sys/compat/linux/common/linux_file64.c
sys/compat/linux/common/linux_ioctl.c
sys/compat/linux/common/linux_misc.c
sys/compat/linux/common/linux_misc_notalpha.c
sys/compat/linux/common/linux_sched.c
sys/compat/linux/common/linux_socket.c
sys/compat/linux/common/linux_time.c
sys/compat/linux/common/linux_uselib.c
sys/compat/linux32/common/linux32_exec_elf32.c
sys/compat/linux32/common/linux32_misc.c
sys/compat/linux32/common/linux32_time.c
sys/compat/mach/mach_port.c
sys/compat/mach/mach_task.c
sys/compat/ndis/kern_ndis.c
sys/compat/ndis/nbcompat.h
sys/compat/ndis/subr_ndis.c
sys/compat/netbsd32/netbsd32.h
sys/compat/netbsd32/netbsd32_compat_30.c
sys/compat/netbsd32/netbsd32_exec_elf32.c
sys/compat/netbsd32/netbsd32_fs.c
sys/compat/netbsd32/netbsd32_netbsd.c
sys/compat/netbsd32/netbsd32_syscall.h
sys/compat/netbsd32/netbsd32_syscallargs.h
sys/compat/netbsd32/netbsd32_syscalls.c
sys/compat/netbsd32/netbsd32_sysent.c
sys/compat/netbsd32/netbsd32_time.c
sys/compat/netbsd32/syscalls.conf
sys/compat/netbsd32/syscalls.master
sys/compat/osf1/osf1_exec_ecoff.c
sys/compat/ossaudio/ossaudio.c
sys/compat/pecoff/pecoff_exec.c
sys/compat/pecoff/pecoff_syscall.h
sys/compat/pecoff/pecoff_syscallargs.h
sys/compat/pecoff/pecoff_syscalls.c
sys/compat/pecoff/pecoff_sysent.c
sys/compat/pecoff/syscalls.master
sys/compat/sunos/sunos_misc.c
sys/compat/sunos32/sunos32_misc.c
sys/compat/svr4/svr4_fcntl.c
sys/compat/svr4/svr4_lwp.c
sys/compat/svr4/svr4_stream.c
sys/compat/svr4_32/svr4_32_exec_elf32.c
sys/compat/svr4_32/svr4_32_fcntl.c
sys/compat/svr4_32/svr4_32_stat.c
sys/compat/svr4_32/svr4_32_stream.c
sys/compat/sys/mount.h
sys/conf/Makefile.kern.inc
sys/conf/files
sys/conf/std
sys/contrib/dev/ath/netbsd/ah_osdep.c
sys/crypto/cast128/cast128.c
sys/ddb/db_command.c
sys/ddb/db_variables.c
sys/ddb/db_xxx.c
sys/dev/DEVNAMES
sys/dev/acpi/acpi_acad.c
sys/dev/acpi/acpi_ec.c
sys/dev/acpi/acpica/OsdMisc.c
sys/dev/arcbios/arcbios_tty.c
sys/dev/ata/ata_raid_adaptec.c
sys/dev/ata/ata_raid_promise.c
sys/dev/ata/ld_ataraid.c
sys/dev/ata/wd.c
sys/dev/audio.c
sys/dev/audiovar.h
sys/dev/cardbus/cardbus_map.c
sys/dev/cardbus/if_rtw_cardbus.c
sys/dev/cardbus/rbus.c
sys/dev/ccd.c
sys/dev/cgd.c
sys/dev/cons.c
sys/dev/dec/dz.c
sys/dev/dksubr.c
sys/dev/dkwedge/dk.c
sys/dev/dmover/dmover_io.c
sys/dev/firmload.c
sys/dev/fss.c
sys/dev/gpib/rd.c
sys/dev/hpc/biconsdev.c
sys/dev/hpc/hpcfb.c
sys/dev/hpc/hpf1275a_tty.c
sys/dev/i2c/adt7463.c
sys/dev/i2c/ddc.c
sys/dev/i2c/ddcreg.h
sys/dev/i2c/ddcvar.h
sys/dev/i2c/files.i2c
sys/dev/i2c/lm75.c
sys/dev/i2c/lm75reg.h
sys/dev/i2o/iop.c
sys/dev/i2o/ld_iop.c
sys/dev/ic/ac97.c
sys/dev/ic/ac97var.h
sys/dev/ic/adwlib.c
sys/dev/ic/aic7xxx.c
sys/dev/ic/aic7xxx_osm.h
sys/dev/ic/aic7xxxvar.h
sys/dev/ic/an.c
sys/dev/ic/ath.c
sys/dev/ic/ath_netbsd.c
sys/dev/ic/athrate-sample.c
sys/dev/ic/atppc.c
sys/dev/ic/awi.c
sys/dev/ic/bha.c
sys/dev/ic/cd18xx.c
sys/dev/ic/ciss.c
sys/dev/ic/clmpcc.c
sys/dev/ic/com.c
sys/dev/ic/cy.c
sys/dev/ic/dpt.c
sys/dev/ic/elinkxl.c
sys/dev/ic/hd44780_subr.c
sys/dev/ic/i82365.c
sys/dev/ic/i8259reg.h
sys/dev/ic/igsfb.c
sys/dev/ic/iha.c
sys/dev/ic/isp_netbsd.c
sys/dev/ic/lptreg.h
sys/dev/ic/mb86950.c
sys/dev/ic/midway.c
sys/dev/ic/mlx.c
sys/dev/ic/ne2000.c
sys/dev/ic/nslm7x.c
sys/dev/ic/nslm7xvar.h
sys/dev/ic/pcdisplay_subr.c
sys/dev/ic/pcdisplayvar.h
sys/dev/ic/ralvar.h
sys/dev/ic/rrunner.c
sys/dev/ic/rtl8169.c
sys/dev/ic/rtw.c
sys/dev/ic/rtwvar.h
sys/dev/ic/smc83c170.c
sys/dev/ic/smc83c170reg.h
sys/dev/ic/sti.c
sys/dev/ic/tcic2.c
sys/dev/ic/vga.c
sys/dev/ic/vga_raster.c
sys/dev/ic/wi.c
sys/dev/ic/z8530tty.c
sys/dev/ieee1394/files.ieee1394
sys/dev/ieee1394/firewire.c
sys/dev/ieee1394/fw_port.h
sys/dev/ieee1394/fwcrom.c
sys/dev/ieee1394/fwdma.c
sys/dev/ieee1394/fwohci.c
sys/dev/ieee1394/sbp.c
sys/dev/if_ndis/if_ndis.c
sys/dev/if_ndis/if_ndis_pci.c
sys/dev/if_ndis/if_ndisvar.h
sys/dev/ir/irframe_tty.c
sys/dev/isa/ega.c
sys/dev/isa/fd.c
sys/dev/isa/files.isa
sys/dev/isa/gus.c
sys/dev/isa/if_iy.c
sys/dev/isa/if_lc_isa.c
sys/dev/isa/if_ntwoc_isa.c
sys/dev/isa/ioat66.c
sys/dev/isa/it.c
sys/dev/isa/itvar.h
sys/dev/isa/mcd.c
sys/dev/isa/pcdisplay.c
sys/dev/isa/pckbc_isa.c
sys/dev/isa/satlink.c
sys/dev/isa/sb.c
sys/dev/isa/sbdsp.c
sys/dev/isa/sbdspvar.h
sys/dev/isa/wt.c
sys/dev/isapnp/if_an_isapnp.c
sys/dev/isapnp/isapnpdevs
sys/dev/isapnp/isapnpdevs.c
sys/dev/isapnp/isapnpdevs.h
sys/dev/isapnp/isapnpres.c
sys/dev/isapnp/mpu_isapnp.c
sys/dev/isapnp/sb_isapnp.c
sys/dev/kloader.c
sys/dev/kttcp.c
sys/dev/marvell/gtmpsc.c
sys/dev/midisyn.c
sys/dev/mii/brgphy.c
sys/dev/mii/miidevs
sys/dev/mii/miidevs.h
sys/dev/mii/miidevs_data.h
sys/dev/ofw/ofcons.c
sys/dev/onewire/files.onewire
sys/dev/onewire/onewire_subr.c
sys/dev/onewire/onewirereg.h
sys/dev/onewire/onewirevar.h
sys/dev/onewire/owtemp.c
sys/dev/pci/agp_amd.c
sys/dev/pci/agp_i810.c
sys/dev/pci/ahc_pci.c
sys/dev/pci/amdpm_smbus.c
sys/dev/pci/amdpmvar.h
sys/dev/pci/amr.c
sys/dev/pci/auich.c
sys/dev/pci/auixp.c
sys/dev/pci/azalia.c
sys/dev/pci/azalia_codec.c
sys/dev/pci/cmpci.c
sys/dev/pci/cs4280.c
sys/dev/pci/cs4280reg.h
sys/dev/pci/cs4281.c
sys/dev/pci/cs428x.c
sys/dev/pci/cs428x.h
sys/dev/pci/cz.c
sys/dev/pci/emuxki.c
sys/dev/pci/esm.c
sys/dev/pci/eso.c
sys/dev/pci/files.pci
sys/dev/pci/if_bge.c
sys/dev/pci/if_bgereg.h
sys/dev/pci/if_de.c
sys/dev/pci/if_en_pci.c
sys/dev/pci/if_ipw.c
sys/dev/pci/if_ipwvar.h
sys/dev/pci/if_iwi.c
sys/dev/pci/if_lmc.c
sys/dev/pci/if_lmc.h
sys/dev/pci/if_re_pci.c
sys/dev/pci/if_rtw_pci.c
sys/dev/pci/if_sip.c
sys/dev/pci/if_sk.c
sys/dev/pci/if_tlp_pci.c
sys/dev/pci/if_txp.c
sys/dev/pci/if_wm.c
sys/dev/pci/igsfb_pci.c
sys/dev/pci/machfb.c
sys/dev/pci/mly.c
sys/dev/pci/pccbbreg.h
sys/dev/pci/pcidevs
sys/dev/pci/pcidevs.h
sys/dev/pci/pcidevs_data.h
sys/dev/pci/pcscp.c
sys/dev/pci/piixide.c
sys/dev/pci/piixpm.c
sys/dev/pci/piixpmreg.h
sys/dev/pci/tga.c
sys/dev/pci/trm.c
sys/dev/pci/twe.c
sys/dev/pci/twereg.h
sys/dev/pci/viaide.c
sys/dev/pci/voodoofb.c
sys/dev/pci/voodoofbreg.h
sys/dev/pcmcia/files.pcmcia
sys/dev/pcmcia/if_cnw.c
sys/dev/pcmcia/if_ray.c
sys/dev/pcmcia/if_xi.c
sys/dev/pcmcia/pcmcia_cis_quirks.c
sys/dev/ppbus/pps_ppbus.c
sys/dev/qbus/dhu.c
sys/dev/qbus/dl.c
sys/dev/raidframe/rf_copyback.c
sys/dev/raidframe/rf_dagdegrd.c
sys/dev/raidframe/rf_dagdegrd.h
sys/dev/raidframe/rf_dagdegwr.c
sys/dev/raidframe/rf_dagdegwr.h
sys/dev/raidframe/rf_decluster.c
sys/dev/raidframe/rf_decluster.h
sys/dev/raidframe/rf_declusterPQ.c
sys/dev/raidframe/rf_declusterPQ.h
sys/dev/raidframe/rf_disks.c
sys/dev/raidframe/rf_evenodd.c
sys/dev/raidframe/rf_evenodd.h
sys/dev/raidframe/rf_evenodd_dagfuncs.c
sys/dev/raidframe/rf_general.h
sys/dev/raidframe/rf_interdecluster.c
sys/dev/raidframe/rf_interdecluster.h
sys/dev/raidframe/rf_map.c
sys/dev/raidframe/rf_netbsdkintf.c
sys/dev/raidframe/rf_paritylog.c
sys/dev/raidframe/rf_paritylogging.c
sys/dev/raidframe/rf_raid5.c
sys/dev/raidframe/rf_reconstruct.c
sys/dev/raidframe/rf_reconutil.c
sys/dev/rasops/rasops_bitops.h
sys/dev/rnd.c
sys/dev/sbus/magma.c
sys/dev/sbus/p9100.c
sys/dev/sbus/spif.c
sys/dev/scsipi/atapi_wdc.c
sys/dev/scsipi/scsipi_base.c
sys/dev/scsipi/scsipi_ioctl.c
sys/dev/scsipi/ses.c
sys/dev/scsipi/st.c
sys/dev/scsipi/stvar.h
sys/dev/sun/cgsix.c
sys/dev/sun/fbio.h
sys/dev/tc/cfb.c
sys/dev/tc/mfb.c
sys/dev/tc/pxg.c
sys/dev/tc/sfb.c
sys/dev/tc/sfbplus.c
sys/dev/tc/stic.c
sys/dev/tc/tfb.c
sys/dev/tc/xcfb.c
sys/dev/tc/zs_ioasic.c
sys/dev/usb/ehci.c
sys/dev/usb/ezload.c
sys/dev/usb/hid.c
sys/dev/usb/if_atu.c
sys/dev/usb/if_atureg.h
sys/dev/usb/ohci.c
sys/dev/usb/uaudio.c
sys/dev/usb/ubtbcmfw.c
sys/dev/usb/ucom.c
sys/dev/usb/ucycom.c
sys/dev/usb/ugen.c
sys/dev/usb/uhci.c
sys/dev/usb/uhub.c
sys/dev/usb/umidi.c
sys/dev/usb/utoppy.c
sys/dev/verified_exec.c
sys/dev/videomode/Makefile.ediddevs
sys/dev/videomode/devlist2h.awk
sys/dev/videomode/edid.c
sys/dev/videomode/ediddevs
sys/dev/videomode/ediddevs.h
sys/dev/videomode/ediddevs_data.h
sys/dev/videomode/edidreg.h
sys/dev/videomode/edidvar.h
sys/dev/videomode/files.videomode
sys/dev/videomode/modelines2c.awk
sys/dev/videomode/vesagtf.c
sys/dev/videomode/vesagtf.h
sys/dev/videomode/videomode.c
sys/dev/vme/xd.c
sys/dev/vme/xy.c
sys/dev/vnd.c
sys/dev/vndvar.h
sys/dev/wscons/files.wscons
sys/dev/wscons/wsdisplay.c
sys/dev/wscons/wsdisplay_compat_usl.c
sys/dev/wscons/wsdisplay_vcons.c
sys/dev/wscons/wsdisplay_vconsvar.h
sys/dev/wscons/wsdisplayvar.h
sys/dev/wscons/wskbd.c
sys/dist/acpica/dsmethod.c
sys/dist/acpica/tbinstal.c
sys/dist/ipf/netinet/fil.c
sys/dist/ipf/netinet/ip_auth.c
sys/dist/ipf/netinet/ip_compat.h
sys/dist/ipf/netinet/ip_nat.c
sys/dist/ipf/netinet/ip_rpcb_pxy.c
sys/dist/pf/net/pf.c
sys/dist/pf/net/pf_norm.c
sys/dist/pf/net/pf_table.c
sys/fs/adosfs/adlookup.c
sys/fs/adosfs/advfsops.c
sys/fs/adosfs/advnops.c
sys/fs/cd9660/cd9660_extern.h
sys/fs/cd9660/cd9660_lookup.c
sys/fs/cd9660/cd9660_rrip.c
sys/fs/cd9660/cd9660_vfsops.c
sys/fs/cd9660/cd9660_vnops.c
sys/fs/filecorefs/filecore_bmap.c
sys/fs/filecorefs/filecore_extern.h
sys/fs/filecorefs/filecore_lookup.c
sys/fs/filecorefs/filecore_utils.c
sys/fs/filecorefs/filecore_vfsops.c
sys/fs/filecorefs/filecore_vnops.c
sys/fs/msdosfs/denode.h
sys/fs/msdosfs/msdosfs_denode.c
sys/fs/msdosfs/msdosfs_fat.c
sys/fs/msdosfs/msdosfs_lookup.c
sys/fs/msdosfs/msdosfs_vfsops.c
sys/fs/msdosfs/msdosfs_vnops.c
sys/fs/ntfs/ntfs.h
sys/fs/ntfs/ntfs_subr.c
sys/fs/ntfs/ntfs_vfsops.c
sys/fs/ntfs/ntfs_vnops.c
sys/fs/ptyfs/ptyfs_subr.c
sys/fs/ptyfs/ptyfs_vfsops.c
sys/fs/ptyfs/ptyfs_vnops.c
sys/fs/smbfs/smbfs.h
sys/fs/smbfs/smbfs_io.c
sys/fs/smbfs/smbfs_kq.c
sys/fs/smbfs/smbfs_node.c
sys/fs/smbfs/smbfs_node.h
sys/fs/smbfs/smbfs_subr.h
sys/fs/smbfs/smbfs_vfsops.c
sys/fs/smbfs/smbfs_vnops.c
sys/fs/sysvbfs/bfs_sysvbfs.c
sys/fs/sysvbfs/sysvbfs.h
sys/fs/sysvbfs/sysvbfs_vfsops.c
sys/fs/sysvbfs/sysvbfs_vnops.c
sys/fs/tmpfs/tmpfs.h
sys/fs/tmpfs/tmpfs_subr.c
sys/fs/tmpfs/tmpfs_vfsops.c
sys/fs/tmpfs/tmpfs_vnops.c
sys/fs/udf/udf_subr.c
sys/fs/udf/udf_vfsops.c
sys/fs/udf/udf_vnops.c
sys/fs/unicode.h
sys/fs/union/union.h
sys/fs/union/union_subr.c
sys/fs/union/union_vfsops.c
sys/fs/union/union_vnops.c
sys/kern/bufq_priocscan.c
sys/kern/core_elf32.c
sys/kern/exec_elf32.c
sys/kern/exec_macho.c
sys/kern/exec_script.c
sys/kern/exec_subr.c
sys/kern/init_main.c
sys/kern/init_sysctl.c
sys/kern/init_sysent.c
sys/kern/kern_acct.c
sys/kern/kern_auth.c
sys/kern/kern_clock.c
sys/kern/kern_descrip.c
sys/kern/kern_event.c
sys/kern/kern_exec.c
sys/kern/kern_exit.c
sys/kern/kern_fork.c
sys/kern/kern_ktrace.c
sys/kern/kern_lwp.c
sys/kern/kern_ntptime.c
sys/kern/kern_pax.c
sys/kern/kern_physio.c
sys/kern/kern_proc.c
sys/kern/kern_prot.c
sys/kern/kern_resource.c
sys/kern/kern_sa.c
sys/kern/kern_securelevel.c
sys/kern/kern_sig.c
sys/kern/kern_synch.c
sys/kern/kern_sysctl.c
sys/kern/kern_systrace.c
sys/kern/kern_time.c
sys/kern/kern_verifiedexec.c
sys/kern/kern_xxx.c
sys/kern/subr_autoconf.c
sys/kern/subr_disk.c
sys/kern/subr_extent.c
sys/kern/subr_iostat.c
sys/kern/subr_pool.c
sys/kern/subr_prop.c
sys/kern/subr_workqueue.c
sys/kern/sys_pipe.c
sys/kern/sys_process.c
sys/kern/sys_socket.c
sys/kern/syscalls.c
sys/kern/syscalls.master
sys/kern/sysv_ipc.c
sys/kern/sysv_msg.c
sys/kern/sysv_sem.c
sys/kern/sysv_shm.c
sys/kern/tty.c
sys/kern/tty_bsdpty.c
sys/kern/tty_ptm.c
sys/kern/tty_pty.c
sys/kern/tty_tty.c
sys/kern/uipc_domain.c
sys/kern/uipc_mbuf.c
sys/kern/uipc_sem.c
sys/kern/uipc_socket.c
sys/kern/uipc_socket2.c
sys/kern/uipc_syscalls.c
sys/kern/uipc_usrreq.c
sys/kern/vfs_bio.c
sys/kern/vfs_cache.c
sys/kern/vfs_getcwd.c
sys/kern/vfs_lockf.c
sys/kern/vfs_lookup.c
sys/kern/vfs_subr.c
sys/kern/vfs_syscalls.c
sys/kern/vfs_vnops.c
sys/kern/vfs_xattr.c
sys/kern/vnode_if.c
sys/kern/vnode_if.sh
sys/kern/vnode_if.src
sys/lib/libkern/Makefile
sys/lib/libkern/arch/sh3/ashiftrt.S
sys/lib/libkern/arch/sh3/ashlsi3.S
sys/lib/libkern/arch/sh3/ashrsi3.S
sys/lib/libkern/arch/sh3/byte_swap_2.S
sys/lib/libkern/arch/sh3/byte_swap_4.S
sys/lib/libkern/arch/sh3/lshrsi3.S
sys/lib/libkern/arch/sh3/movstr.S
sys/lib/libkern/arch/sh3/movstrSI.S
sys/lib/libkern/arch/sh3/movstr_i4.S
sys/lib/libkern/arch/sh3/mulsi3.S
sys/lib/libkern/arch/sh3/sdivsi3.S
sys/lib/libkern/arch/sh3/udivsi3.S
sys/lib/libkern/libkern.h
sys/lib/libsa/Makefile
sys/lib/libsa/bootp.c
sys/lib/libsa/ufs.c
sys/lkm/Makefile.inc
sys/lkm/dev/Makefile.inc
sys/lkm/dev/pci/Makefile.inc
sys/lkm/dev/pcmcia/Makefile.inc
sys/miscfs/deadfs/dead_vnops.c
sys/miscfs/fdesc/fdesc_vfsops.c
sys/miscfs/fdesc/fdesc_vnops.c
sys/miscfs/fifofs/fifo_vnops.c
sys/miscfs/genfs/genfs_node.h
sys/miscfs/genfs/genfs_vnops.c
sys/miscfs/genfs/layer_extern.h
sys/miscfs/genfs/layer_vfsops.c
sys/miscfs/genfs/layer_vnops.c
sys/miscfs/kernfs/kernfs_vfsops.c
sys/miscfs/kernfs/kernfs_vnops.c
sys/miscfs/portal/portal.h
sys/miscfs/portal/portal_vfsops.c
sys/miscfs/portal/portal_vnops.c
sys/miscfs/procfs/procfs_ctl.c
sys/miscfs/procfs/procfs_fd.c
sys/miscfs/procfs/procfs_map.c
sys/miscfs/procfs/procfs_status.c
sys/miscfs/procfs/procfs_vfsops.c
sys/miscfs/procfs/procfs_vnops.c
sys/miscfs/specfs/spec_vnops.c
sys/miscfs/specfs/specdev.h
sys/miscfs/syncfs/sync_subr.c
sys/miscfs/syncfs/sync_vnops.c
sys/miscfs/umapfs/umap.h
sys/miscfs/umapfs/umap_subr.c
sys/miscfs/umapfs/umap_vfsops.c
sys/miscfs/umapfs/umap_vnops.c
sys/net/agr/if_agr.c
sys/net/bpf.c
sys/net/bpf_filter.c
sys/net/bridgestp.c
sys/net/if.c
sys/net/if.h
sys/net/if_bridge.c
sys/net/if_ecosubr.c
sys/net/if_ethersubr.c
sys/net/if_fddisubr.c
sys/net/if_gif.c
sys/net/if_gre.c
sys/net/if_llc.h
sys/net/if_media.h
sys/net/if_ppp.c
sys/net/if_pppoe.c
sys/net/if_sl.c
sys/net/if_spppsubr.c
sys/net/if_stf.c
sys/net/if_strip.c
sys/net/if_tap.c
sys/net/if_tokensubr.c
sys/net/if_tun.c
sys/net/if_types.h
sys/net/if_vlan.c
sys/net/net_osdep.h
sys/net/ppp_tty.c
sys/net/raw_usrreq.c
sys/net/route.c
sys/net/rtsock.c
sys/net/slcompress.c
sys/net/zlib.c
sys/net80211/ieee80211_ioctl.c
sys/net80211/ieee80211_node.c
sys/netatalk/at_control.c
sys/netatalk/ddp_usrreq.c
sys/netccitt/if_x25subr.c
sys/netccitt/llc_input.c
sys/netccitt/llc_timer.c
sys/netccitt/pk_acct.c
sys/netccitt/pk_output.c
sys/netccitt/pk_usrreq.c
sys/netinet/Makefile
sys/netinet/if_arp.c
sys/netinet/if_inarp.h
sys/netinet/in.c
sys/netinet/in.h
sys/netinet/in_pcb.c
sys/netinet/in_proto.c
sys/netinet/ip6.h
sys/netinet/ip_carp.c
sys/netinet/ip_carp.h
sys/netinet/ip_icmp.h
sys/netinet/ip_input.c
sys/netinet/ip_mroute.c
sys/netinet/ip_output.c
sys/netinet/raw_ip.c
sys/netinet/tcp_input.c
sys/netinet/tcp_subr.c
sys/netinet/tcp_timer.c
sys/netinet/tcp_usrreq.c
sys/netinet6/ah_output.c
sys/netinet6/files.netinet6
sys/netinet6/icmp6.c
sys/netinet6/in6.c
sys/netinet6/in6.h
sys/netinet6/in6_ifattach.c
sys/netinet6/in6_pcb.c
sys/netinet6/in6_pcb.h
sys/netinet6/in6_proto.c
sys/netinet6/in6_src.c
sys/netinet6/in6_var.h
sys/netinet6/ip6_input.c
sys/netinet6/ip6_output.c
sys/netinet6/ip6_var.h
sys/netinet6/nd6.c
sys/netinet6/nd6_nbr.c
sys/netinet6/raw_ip6.c
sys/netinet6/udp6_output.c
sys/netinet6/udp6_usrreq.c
sys/netipsec/ipsec.c
sys/netipsec/ipsec.h
sys/netipsec/ipsec_netbsd.c
sys/netipsec/xform_ah.c
sys/netipsec/xform_esp.c
sys/netisdn/i4b_ipr.c
sys/netiso/esis.c
sys/netiso/iso.c
sys/netiso/iso.h
sys/netiso/iso_chksum.c
sys/netiso/iso_pcb.c
sys/netiso/iso_snpac.c
sys/netiso/tp_emit.c
sys/netiso/tp_output.c
sys/netiso/tp_pcb.c
sys/netns/idp_usrreq.c
sys/netns/ns.c
sys/netns/ns_ip.c
sys/netns/ns_pcb.c
sys/netns/spp_usrreq.c
sys/netsmb/smb_conn.c
sys/netsmb/smb_dev.h
sys/netsmb/smb_iod.c
sys/netsmb/smb_smb.c
sys/netsmb/smb_subr.c
sys/netsmb/smb_subr.h
sys/netsmb/smb_trantcp.c
sys/nfs/krpc_subr.c
sys/nfs/nfs.h
sys/nfs/nfs_bio.c
sys/nfs/nfs_bootparam.c
sys/nfs/nfs_export.c
sys/nfs/nfs_kq.c
sys/nfs/nfs_node.c
sys/nfs/nfs_nqlease.c
sys/nfs/nfs_serv.c
sys/nfs/nfs_socket.c
sys/nfs/nfs_subs.c
sys/nfs/nfs_syscalls.c
sys/nfs/nfs_var.h
sys/nfs/nfs_vfsops.c
sys/nfs/nfs_vnops.c
sys/nfs/nfsmount.h
sys/nfs/nfsnode.h
sys/nfs/nqnfs.h
sys/opencrypto/cryptodev.c
sys/sys/Makefile
sys/sys/bswap.h
sys/sys/buf.h
sys/sys/cdefs_aout.h
sys/sys/cdefs_elf.h
sys/sys/device.h
sys/sys/disk.h
sys/sys/endian.h
sys/sys/exec.h
sys/sys/exec_elf.h
sys/sys/extattr.h
sys/sys/file.h
sys/sys/iostat.h
sys/sys/ipc.h
sys/sys/kauth.h
sys/sys/lkm.h
sys/sys/lockf.h
sys/sys/lwp.h
sys/sys/mount.h
sys/sys/namei.h
sys/sys/param.h
sys/sys/pax.h
sys/sys/proc.h
sys/sys/properties.h
sys/sys/pty.h
sys/sys/resource.h
sys/sys/signalvar.h
sys/sys/socket.h
sys/sys/socketvar.h
sys/sys/sockio.h
sys/sys/statvfs.h
sys/sys/syscall.h
sys/sys/syscallargs.h
sys/sys/sysctl.h
sys/sys/types.h
sys/sys/ucred.h
sys/sys/user.h
sys/sys/vnode.h
sys/sys/vnode_if.h
sys/ufs/ext2fs/ext2fs_alloc.c
sys/ufs/ext2fs/ext2fs_balloc.c
sys/ufs/ext2fs/ext2fs_extern.h
sys/ufs/ext2fs/ext2fs_inode.c
sys/ufs/ext2fs/ext2fs_lookup.c
sys/ufs/ext2fs/ext2fs_readwrite.c
sys/ufs/ext2fs/ext2fs_subr.c
sys/ufs/ext2fs/ext2fs_vfsops.c
sys/ufs/ext2fs/ext2fs_vnops.c
sys/ufs/ffs/ffs_alloc.c
sys/ufs/ffs/ffs_balloc.c
sys/ufs/ffs/ffs_extern.h
sys/ufs/ffs/ffs_inode.c
sys/ufs/ffs/ffs_snapshot.c
sys/ufs/ffs/ffs_softdep.c
sys/ufs/ffs/ffs_softdep.stub.c
sys/ufs/ffs/ffs_vfsops.c
sys/ufs/ffs/ffs_vnops.c
sys/ufs/lfs/lfs.h
sys/ufs/lfs/lfs_alloc.c
sys/ufs/lfs/lfs_balloc.c
sys/ufs/lfs/lfs_bio.c
sys/ufs/lfs/lfs_extern.h
sys/ufs/lfs/lfs_inode.c
sys/ufs/lfs/lfs_itimes.c
sys/ufs/lfs/lfs_segment.c
sys/ufs/lfs/lfs_subr.c
sys/ufs/lfs/lfs_syscalls.c
sys/ufs/lfs/lfs_vfsops.c
sys/ufs/lfs/lfs_vnops.c
sys/ufs/mfs/mfs_extern.h
sys/ufs/mfs/mfs_vfsops.c
sys/ufs/mfs/mfs_vnops.c
sys/ufs/ufs/extattr.h
sys/ufs/ufs/quota.h
sys/ufs/ufs/ufs_extattr.c
sys/ufs/ufs/ufs_extern.h
sys/ufs/ufs/ufs_inode.c
sys/ufs/ufs/ufs_lookup.c
sys/ufs/ufs/ufs_quota.c
sys/ufs/ufs/ufs_readwrite.c
sys/ufs/ufs/ufs_vfsops.c
sys/ufs/ufs/ufs_vnops.c
sys/ufs/ufs/ufsmount.h
sys/uvm/uvm_amap.c
sys/uvm/uvm_bio.c
sys/uvm/uvm_extern.h
sys/uvm/uvm_glue.c
sys/uvm/uvm_km.c
sys/uvm/uvm_loan.c
sys/uvm/uvm_map.c
sys/uvm/uvm_map.h
sys/uvm/uvm_mmap.c
sys/uvm/uvm_page.c
sys/uvm/uvm_pager.c
sys/uvm/uvm_pglist.c
sys/uvm/uvm_swap.c
sys/uvm/uvm_unix.c
sys/uvm/uvm_vnode.c
--- a/sys/altq/altq_afmap.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_afmap.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_afmap.c,v 1.9 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_afmap.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_afmap.c,v 1.9 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_afmap.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
@@ -53,6 +53,7 @@
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -80,11 +81,9 @@
 {
 	struct afm_head *head;
 
-	MALLOC(head, struct afm_head *, sizeof(struct afm_head),
-	       M_DEVBUF, M_WAITOK);
+	head = malloc(sizeof(struct afm_head), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (head == NULL)
 		panic("afm_alloc: malloc failed!");
-	(void)memset(head, 0, sizeof(struct afm_head));
 
 	/* initialize per interface afmap list */
 	LIST_INIT(&head->afh_head);
@@ -114,7 +113,7 @@
 
 	LIST_REMOVE(head, afh_chain);
 
-	FREE(head, M_DEVBUF);
+	free(head, M_DEVBUF);
 	return 0;
 }
 
@@ -159,11 +158,9 @@
 	} else
 		return (EINVAL);
 
-	MALLOC(afm, struct afm *, sizeof(struct afm),
-	       M_DEVBUF, M_WAITOK);
+	afm = malloc(sizeof(struct afm), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (afm == NULL)
 		return (ENOMEM);
-	(void)memset(afm, 0, sizeof(struct afm));
 
 	afm->afm_vci = flowmap->af_vci;
 	afm->afm_vpi = flowmap->af_vpi;
@@ -179,7 +176,7 @@
 	struct afm *afm;
 {
 	LIST_REMOVE(afm, afm_list);
-	FREE(afm, M_DEVBUF);
+	free(afm, M_DEVBUF);
 	return (0);
 }
 
@@ -387,7 +384,8 @@
 #if (__FreeBSD_version > 400000)
 		error = suser(p);
 #else
-		error = suser(p->p_ucred, &p->p_acflag);
+		error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER,
+					  &p->p_acflag);
 #endif
 		if (error)
 			return (error);
--- a/sys/altq/altq_blue.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_blue.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_blue.c,v 1.12 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_blue.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_blue.c,v 1.8 2002/01/07 11:25:40 kjc Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.12 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -83,6 +83,7 @@
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -177,7 +178,9 @@
 		if ((error = suser(p)) != 0)
 			return (error);
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 			return (error);
 #endif
 		break;
@@ -211,15 +214,28 @@
 		}
 
 		/* allocate and initialize blue_state_t */
-		MALLOC(rqp, blue_queue_t *, sizeof(blue_queue_t), M_DEVBUF, M_WAITOK);
-		(void)memset(rqp, 0, sizeof(blue_queue_t));
+		rqp = malloc(sizeof(blue_queue_t), M_DEVBUF, M_WAITOK|M_ZERO);
+		if (rqp == NULL) {
+			error = ENOMEM;
+			break;
+		}
 
-		MALLOC(rqp->rq_q, class_queue_t *, sizeof(class_queue_t),
-		       M_DEVBUF, M_WAITOK);
-		(void)memset(rqp->rq_q, 0, sizeof(class_queue_t));
+		rqp->rq_q = malloc(sizeof(class_queue_t), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
+		if (rqp->rq_q == NULL) {
+			free(rqp, M_DEVBUF);
+			error = ENOMEM;
+			break;
+		}
 
-		MALLOC(rqp->rq_blue, blue_t *, sizeof(blue_t), M_DEVBUF, M_WAITOK);
-		(void)memset(rqp->rq_blue, 0, sizeof(blue_t));
+		rqp->rq_blue = malloc(sizeof(blue_t), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
+		if (rqp->rq_blue == NULL) {
+			free(rqp->rq_q, M_DEVBUF);
+			free(rqp, M_DEVBUF);
+			error = ENOMEM;
+			break;
+		}
 
 		rqp->rq_ifq = &ifp->if_snd;
 		qtail(rqp->rq_q) = NULL;
@@ -236,9 +252,9 @@
 				    blue_enqueue, blue_dequeue, blue_request,
 				    NULL, NULL);
 		if (error) {
-			FREE(rqp->rq_blue, M_DEVBUF);
-			FREE(rqp->rq_q, M_DEVBUF);
-			FREE(rqp, M_DEVBUF);
+			free(rqp->rq_blue, M_DEVBUF);
+			free(rqp->rq_q, M_DEVBUF);
+			free(rqp, M_DEVBUF);
 			break;
 		}
 
@@ -344,9 +360,9 @@
 			printf("blue_detach: no state found in blue_list!\n");
 	}
 
-	FREE(rqp->rq_q, M_DEVBUF);
-	FREE(rqp->rq_blue, M_DEVBUF);
-	FREE(rqp, M_DEVBUF);
+	free(rqp->rq_q, M_DEVBUF);
+	free(rqp->rq_blue, M_DEVBUF);
+	free(rqp, M_DEVBUF);
 	return (error);
 }
 
--- a/sys/altq/altq_cbq.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_cbq.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_cbq.c,v 1.12 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_cbq.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_cbq.c,v 1.11 2002/10/04 14:24:09 kjc Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.12 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -57,6 +57,7 @@
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -617,19 +618,16 @@
 		return (ENXIO);
 
 	/* allocate and initialize cbq_state_t */
-	MALLOC(new_cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK);
+	new_cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (new_cbqp == NULL)
 		return (ENOMEM);
-	(void)memset(new_cbqp, 0, sizeof(cbq_state_t));
  	CALLOUT_INIT(&new_cbqp->cbq_callout);
-	MALLOC(new_cbqp->cbq_class_tbl, struct rm_class **,
-	       sizeof(struct rm_class *) * CBQ_MAX_CLASSES, M_DEVBUF, M_WAITOK);
+	new_cbqp->cbq_class_tbl = malloc(sizeof(struct rm_class *) *
+	    CBQ_MAX_CLASSES, M_DEVBUF, M_WAITOK|M_ZERO);
 	if (new_cbqp->cbq_class_tbl == NULL) {
-		FREE(new_cbqp, M_DEVBUF);
+		free(new_cbqp, M_DEVBUF);
 		return (ENOMEM);
 	}
-	(void)memset(new_cbqp->cbq_class_tbl, 0,
-	    sizeof(struct rm_class *) * CBQ_MAX_CLASSES);
 	new_cbqp->cbq_qlen = 0;
 	new_cbqp->ifnp.ifq_ = &ifp->if_snd;	    /* keep the ifq */
 
@@ -640,8 +638,8 @@
 			    cbq_enqueue, cbq_dequeue, cbq_request,
 			    &new_cbqp->cbq_classifier, acc_classify);
 	if (error) {
-		FREE(new_cbqp->cbq_class_tbl, M_DEVBUF);
-		FREE(new_cbqp, M_DEVBUF);
+		free(new_cbqp->cbq_class_tbl, M_DEVBUF);
+		free(new_cbqp, M_DEVBUF);
 		return (error);
 	}
 
@@ -692,8 +690,8 @@
 	}
 
 	/* deallocate cbq_state_t */
-	FREE(cbqp->cbq_class_tbl, M_DEVBUF);
-	FREE(cbqp, M_DEVBUF);
+	free(cbqp->cbq_class_tbl, M_DEVBUF);
+	free(cbqp, M_DEVBUF);
 
 	return (0);
 }
@@ -863,7 +861,8 @@
 #if (__FreeBSD_version > 400000)
 		error = suser(p);
 #else
-		error = suser(p->p_ucred, &p->p_acflag);
+		error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER,
+					  &p->p_acflag);
 #endif
 		if (error)
 			return (error);
--- a/sys/altq/altq_cdnr.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_cdnr.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_cdnr.c,v 1.10 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_cdnr.c,v 1.10.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cdnr.c,v 1.10 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cdnr.c,v 1.10.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -50,6 +50,7 @@
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -280,10 +281,9 @@
 		return (NULL);
 	}
 
-	MALLOC(cb, struct cdnr_block *, size, M_DEVBUF, M_WAITOK);
+	cb = malloc(size, M_DEVBUF, M_WAITOK|M_ZERO);
 	if (cb == NULL)
 		return (NULL);
-	(void)memset(cb, 0, size);
 
 	cb->cb_len = size;
 	cb->cb_type = type;
@@ -325,7 +325,7 @@
 	if (cb->cb_top != cblock)
 		LIST_REMOVE(cb, cb_next);
 
-	FREE(cb, M_DEVBUF);
+	free(cb, M_DEVBUF);
 }
 
 /*
@@ -1260,7 +1260,9 @@
 #if (__FreeBSD_version > 400000)
 		if ((error = suser(p)) != 0)
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 #endif
 			return (error);
 		break;
--- a/sys/altq/altq_conf.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_conf.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_conf.c,v 1.12 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_conf.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_conf.c,v 1.13 2002/01/29 10:16:01 kjc Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_conf.c,v 1.12 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_conf.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -49,6 +49,7 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
+#include <sys/kauth.h>
 #if defined(__FreeBSD__) && (__FreeBSD_version < 400000) && defined(DEVFS)
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
@@ -275,7 +276,9 @@
 			if ((error = suser(p)) != 0)
 				return (error);
 #else
-			if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+			if ((error = kauth_authorize_generic(p->p_cred,
+						       KAUTH_GENERIC_ISSUSER,
+						       &p->p_acflag)) != 0)
 				return (error);
 #endif
 			break;
--- a/sys/altq/altq_fifoq.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_fifoq.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_fifoq.c,v 1.7 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_fifoq.c,v 1.7.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_fifoq.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_fifoq.c,v 1.7 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_fifoq.c,v 1.7.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -51,6 +51,7 @@
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -139,7 +140,9 @@
 		if ((error = suser(p)) != 0)
 			return (error);
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 			return (error);
 #endif
 		break;
@@ -174,13 +177,11 @@
 		}
 
 		/* allocate and initialize fifoq_state_t */
-		MALLOC(q, fifoq_state_t *, sizeof(fifoq_state_t),
-		       M_DEVBUF, M_WAITOK);
+		q = malloc(sizeof(fifoq_state_t), M_DEVBUF, M_WAITOK|M_ZERO);
 		if (q == NULL) {
 			error = ENOMEM;
 			break;
 		}
-		(void)memset(q, 0, sizeof(fifoq_state_t));
 
 		q->q_ifq = &ifp->if_snd;
 		q->q_head = q->q_tail = NULL;
@@ -194,7 +195,7 @@
 				    fifoq_enqueue, fifoq_dequeue, fifoq_request,
 				    NULL, NULL);
 		if (error) {
-			FREE(q, M_DEVBUF);
+			free(q, M_DEVBUF);
 			break;
 		}
 
@@ -382,7 +383,7 @@
 			printf("fifoq_detach: no state in fifoq_list!\n");
 	}
 
-	FREE(q, M_DEVBUF);
+	free(q, M_DEVBUF);
 	return (error);
 }
 
--- a/sys/altq/altq_hfsc.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_hfsc.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_hfsc.c,v 1.12 2005/12/24 20:10:16 perry Exp $	*/
+/*	$NetBSD: altq_hfsc.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_hfsc.c,v 1.9 2001/10/26 04:56:11 kjc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.12 2005/12/24 20:10:16 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.12.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -65,6 +65,7 @@
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -165,15 +166,13 @@
 	struct hfsc_if *hif;
 	struct service_curve root_sc;
 
-	MALLOC(hif, struct hfsc_if *, sizeof(struct hfsc_if),
-	       M_DEVBUF, M_WAITOK);
+	hif = malloc(sizeof(struct hfsc_if), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (hif == NULL)
 		return (NULL);
-	(void)memset(hif, 0, sizeof(struct hfsc_if));
 
 	hif->hif_eligible = ellist_alloc();
 	if (hif->hif_eligible == NULL) {
-		FREE(hif, M_DEVBUF);
+		free(hif, M_DEVBUF);
 		return NULL;
 	}
 
@@ -187,7 +186,7 @@
 	root_sc.m2 = bandwidth;
 	if ((hif->hif_rootclass =
 	     hfsc_class_create(hif, &root_sc, NULL, 0, 0)) == NULL) {
-		FREE(hif, M_DEVBUF);
+		free(hif, M_DEVBUF);
 		return (NULL);
 	}
 
@@ -221,7 +220,7 @@
 
 	ellist_destroy(hif->hif_eligible);
 
-	FREE(hif, M_DEVBUF);
+	free(hif, M_DEVBUF);
 
 	return (0);
 }
@@ -303,17 +302,13 @@
 	}
 #endif
 
-	MALLOC(cl, struct hfsc_class *, sizeof(struct hfsc_class),
-	       M_DEVBUF, M_WAITOK);
+	cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (cl == NULL)
 		return (NULL);
-	(void)memset(cl, 0, sizeof(struct hfsc_class));
 
-	MALLOC(cl->cl_q, class_queue_t *, sizeof(class_queue_t),
-	       M_DEVBUF, M_WAITOK);
+	cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (cl->cl_q == NULL)
 		goto err_ret;
-	(void)memset(cl->cl_q, 0, sizeof(class_queue_t));
 
 	cl->cl_actc = actlist_alloc();
 	if (cl->cl_actc == NULL)
@@ -359,20 +354,18 @@
 #endif /* ALTQ_RED */
 
 	if (sc != NULL && (sc->m1 != 0 || sc->m2 != 0)) {
-		MALLOC(cl->cl_rsc, struct internal_sc *,
-		       sizeof(struct internal_sc), M_DEVBUF, M_WAITOK);
+		cl->cl_rsc = malloc(sizeof(struct internal_sc), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (cl->cl_rsc == NULL)
 			goto err_ret;
-		(void)memset(cl->cl_rsc, 0, sizeof(struct internal_sc));
 		sc2isc(sc, cl->cl_rsc);
 		rtsc_init(&cl->cl_deadline, cl->cl_rsc, 0, 0);
 		rtsc_init(&cl->cl_eligible, cl->cl_rsc, 0, 0);
 
-		MALLOC(cl->cl_fsc, struct internal_sc *,
-		       sizeof(struct internal_sc), M_DEVBUF, M_WAITOK);
+		cl->cl_fsc = malloc(sizeof(struct internal_sc), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (cl->cl_fsc == NULL)
 			goto err_ret;
-		(void)memset(cl->cl_fsc, 0, sizeof(struct internal_sc));
 		sc2isc(sc, cl->cl_fsc);
 		rtsc_init(&cl->cl_virtual, cl->cl_fsc, 0, 0);
 	}
@@ -416,12 +409,12 @@
 #endif
 	}
 	if (cl->cl_fsc != NULL)
-		FREE(cl->cl_fsc, M_DEVBUF);
+		free(cl->cl_fsc, M_DEVBUF);
 	if (cl->cl_rsc != NULL)
-		FREE(cl->cl_rsc, M_DEVBUF);
+		free(cl->cl_rsc, M_DEVBUF);
 	if (cl->cl_q != NULL)
-		FREE(cl->cl_q, M_DEVBUF);
-	FREE(cl, M_DEVBUF);
+		free(cl->cl_q, M_DEVBUF);
+	free(cl, M_DEVBUF);
 	return (NULL);
 }
 
@@ -473,11 +466,11 @@
 #endif
 	}
 	if (cl->cl_fsc != NULL)
-		FREE(cl->cl_fsc, M_DEVBUF);
+		free(cl->cl_fsc, M_DEVBUF);
 	if (cl->cl_rsc != NULL)
-		FREE(cl->cl_rsc, M_DEVBUF);
-	FREE(cl->cl_q, M_DEVBUF);
-	FREE(cl, M_DEVBUF);
+		free(cl->cl_rsc, M_DEVBUF);
+	free(cl->cl_q, M_DEVBUF);
+	free(cl, M_DEVBUF);
 
 	return (0);
 }
@@ -492,20 +485,18 @@
 
 	if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0) &&
 	    cl->cl_rsc == NULL) {
-		MALLOC(rsc_tmp, struct internal_sc *,
-		       sizeof(struct internal_sc), M_DEVBUF, M_WAITOK);
+		rsc_tmp = malloc(sizeof(struct internal_sc), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (rsc_tmp == NULL)
 			return (ENOMEM);
-		(void)memset(rsc_tmp, 0, sizeof(struct internal_sc));
 	} else
 		rsc_tmp = NULL;
 	if (fsc != NULL && (fsc->m1 != 0 || fsc->m2 != 0) &&
 	    cl->cl_fsc == NULL) {
-		MALLOC(fsc_tmp, struct internal_sc *,
-		       sizeof(struct internal_sc), M_DEVBUF, M_WAITOK);
+		fsc_tmp = malloc(sizeof(struct internal_sc), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (fsc_tmp == NULL)
 			return (ENOMEM);
-		(void)memset(fsc_tmp, 0, sizeof(struct internal_sc));
 	} else
 		fsc_tmp = NULL;
 
@@ -516,7 +507,7 @@
 	if (rsc != NULL) {
 		if (rsc->m1 == 0 && rsc->m2 == 0) {
 			if (cl->cl_rsc != NULL) {
-				FREE(cl->cl_rsc, M_DEVBUF);
+				free(cl->cl_rsc, M_DEVBUF);
 				cl->cl_rsc = NULL;
 			}
 		} else {
@@ -531,7 +522,7 @@
 	if (fsc != NULL) {
 		if (fsc->m1 == 0 && fsc->m2 == 0) {
 			if (cl->cl_fsc != NULL) {
-				FREE(cl->cl_fsc, M_DEVBUF);
+				free(cl->cl_fsc, M_DEVBUF);
 				cl->cl_fsc = NULL;
 			}
 		} else {
@@ -944,8 +935,9 @@
 {
 	ellist_t *head;
 
-	MALLOC(head, ellist_t *, sizeof(ellist_t), M_DEVBUF, M_WAITOK);
-	TAILQ_INIT(head);
+	head = malloc(sizeof(ellist_t), M_DEVBUF, M_WAITOK);
+	if (head != NULL)
+		TAILQ_INIT(head);
 	return (head);
 }
 
@@ -953,7 +945,7 @@
 ellist_destroy(head)
 	ellist_t *head;
 {
-	FREE(head, M_DEVBUF);
+	free(head, M_DEVBUF);
 }
 
 static void
@@ -1055,8 +1047,9 @@
 {
 	actlist_t *head;
 
-	MALLOC(head, actlist_t *, sizeof(actlist_t), M_DEVBUF, M_WAITOK);
-	TAILQ_INIT(head);
+	head = malloc(sizeof(actlist_t), M_DEVBUF, M_WAITOK);
+	if (head != NULL)
+		TAILQ_INIT(head);
 	return (head);
 }
 
@@ -1064,7 +1057,7 @@
 actlist_destroy(head)
 	actlist_t *head;
 {
-	FREE(head, M_DEVBUF);
+	free(head, M_DEVBUF);
 }
 static void
 actlist_insert(cl)
@@ -1463,7 +1456,9 @@
 		if ((error = suser(p)) != 0)
 			return (error);
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 			return (error);
 #endif
 		break;
--- a/sys/altq/altq_priq.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_priq.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_priq.c,v 1.9 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_priq.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_priq.c,v 1.2 2001/10/26 04:56:11 kjc Exp $	*/
 /*
  * Copyright (C) 2000
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.9 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -54,6 +54,7 @@
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -108,11 +109,9 @@
 {
 	struct priq_if *pif;
 
-	MALLOC(pif, struct priq_if *, sizeof(struct priq_if),
-	       M_DEVBUF, M_WAITOK);
+	pif = malloc(sizeof(struct priq_if), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (pif == NULL)
 		return (NULL);
-	(void)memset(pif, 0, sizeof(struct priq_if));
 	pif->pif_bandwidth = bandwidth;
 	pif->pif_maxpri = -1;
 	pif->pif_ifq = ifq;
@@ -144,7 +143,7 @@
 		ASSERT(p != NULL);
 	}
 
-	FREE(pif, M_DEVBUF);
+	free(pif, M_DEVBUF);
 	return (0);
 }
 
@@ -232,17 +231,15 @@
 			red_destroy(cl->cl_red);
 #endif
 	} else {
-		MALLOC(cl, struct priq_class *, sizeof(struct priq_class),
-		       M_DEVBUF, M_WAITOK);
+		cl = malloc(sizeof(struct priq_class), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (cl == NULL)
 			return (NULL);
-		(void)memset(cl, 0, sizeof(struct priq_class));
 
-		MALLOC(cl->cl_q, class_queue_t *, sizeof(class_queue_t),
-		       M_DEVBUF, M_WAITOK);
+		cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (cl->cl_q == NULL)
 			goto err_ret;
-		(void)memset(cl->cl_q, 0, sizeof(class_queue_t));
 	}
 
 	pif->pif_classes[pri] = cl;
@@ -307,8 +304,8 @@
 #endif
 	}
 	if (cl->cl_q != NULL)
-		FREE(cl->cl_q, M_DEVBUF);
-	FREE(cl, M_DEVBUF);
+		free(cl->cl_q, M_DEVBUF);
+	free(cl, M_DEVBUF);
 	return (NULL);
 }
 
@@ -350,8 +347,8 @@
 			red_destroy(cl->cl_red);
 #endif
 	}
-	FREE(cl->cl_q, M_DEVBUF);
-	FREE(cl, M_DEVBUF);
+	free(cl->cl_q, M_DEVBUF);
+	free(cl, M_DEVBUF);
 	return (0);
 }
 
@@ -553,7 +550,9 @@
 		if ((error = suser(p)) != 0)
 			return (error);
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 			return (error);
 #endif
 		break;
--- a/sys/altq/altq_red.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_red.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_red.c,v 1.13 2005/12/24 20:10:16 perry Exp $	*/
+/*	$NetBSD: altq_red.c,v 1.13.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_red.c,v 1.9 2002/01/07 11:25:40 kjc Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.13 2005/12/24 20:10:16 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.13.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -83,6 +83,7 @@
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/kauth.h>
 #ifdef ALTQ_FLOWVALVE
 #include <sys/queue.h>
 #include <sys/time.h>
@@ -271,7 +272,9 @@
 #if (__FreeBSD_version > 400000)
 		if ((error = suser(p)) != 0)
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 #endif
 			return (error);
 		break;
@@ -305,26 +308,24 @@
 		}
 
 		/* allocate and initialize red_queue_t */
-		MALLOC(rqp, red_queue_t *, sizeof(red_queue_t), M_DEVBUF, M_WAITOK);
+		rqp = malloc(sizeof(red_queue_t), M_DEVBUF, M_WAITOK|M_ZERO);
 		if (rqp == NULL) {
 			error = ENOMEM;
 			break;
 		}
-		(void)memset(rqp, 0, sizeof(red_queue_t));
 
-		MALLOC(rqp->rq_q, class_queue_t *, sizeof(class_queue_t),
-		       M_DEVBUF, M_WAITOK);
+		rqp->rq_q = malloc(sizeof(class_queue_t), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (rqp->rq_q == NULL) {
-			FREE(rqp, M_DEVBUF);
+			free(rqp, M_DEVBUF);
 			error = ENOMEM;
 			break;
 		}
-		(void)memset(rqp->rq_q, 0, sizeof(class_queue_t));
 
 		rqp->rq_red = red_alloc(0, 0, 0, 0, 0, 0);
 		if (rqp->rq_red == NULL) {
-			FREE(rqp->rq_q, M_DEVBUF);
-			FREE(rqp, M_DEVBUF);
+			free(rqp->rq_q, M_DEVBUF);
+			free(rqp, M_DEVBUF);
 			error = ENOMEM;
 			break;
 		}
@@ -343,8 +344,8 @@
 				    NULL, NULL);
 		if (error) {
 			red_destroy(rqp->rq_red);
-			FREE(rqp->rq_q, M_DEVBUF);
-			FREE(rqp, M_DEVBUF);
+			free(rqp->rq_q, M_DEVBUF);
+			free(rqp, M_DEVBUF);
 			break;
 		}
 
@@ -501,8 +502,8 @@
 	}
 
 	red_destroy(rqp->rq_red);
-	FREE(rqp->rq_q, M_DEVBUF);
-	FREE(rqp, M_DEVBUF);
+	free(rqp->rq_q, M_DEVBUF);
+	free(rqp, M_DEVBUF);
 	return (error);
 }
 
@@ -519,10 +520,9 @@
 	int	w, i;
 	int	npkts_per_sec;
 
-	MALLOC(rp, red_t *, sizeof(red_t), M_DEVBUF, M_WAITOK);
+	rp = malloc(sizeof(red_t), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (rp == NULL)
 		return (NULL);
-	(void)memset(rp, 0, sizeof(red_t));
 
 	rp->red_avg = 0;
 	rp->red_idle = 1;
@@ -611,7 +611,7 @@
 		fv_destroy(rp->red_flowvalve);
 #endif
 	wtab_destroy(rp->red_wtab);
-	FREE(rp, M_DEVBUF);
+	free(rp, M_DEVBUF);
 }
 
 void
@@ -1003,10 +1003,9 @@
 			return (w);
 		}
 
-	MALLOC(w, struct wtab *, sizeof(struct wtab), M_DEVBUF, M_WAITOK);
+	w = malloc(sizeof(struct wtab), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (w == NULL)
 		panic("wtab_alloc: malloc failed!");
-	(void)memset(w, 0, sizeof(struct wtab));
 	w->w_weight = weight;
 	w->w_refcount = 1;
 	w->w_next = wtab_list;
@@ -1040,7 +1039,7 @@
 			break;
 		}
 
-	FREE(w, M_DEVBUF);
+	free(w, M_DEVBUF);
 	return (0);
 }
 
@@ -1268,19 +1267,16 @@
 	int i, num;
 
 	num = FV_FLOWLISTSIZE;
-	MALLOC(fv, struct flowvalve *, sizeof(struct flowvalve),
-	       M_DEVBUF, M_WAITOK);
+	fv = malloc(sizeof(struct flowvalve), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (fv == NULL)
 		return (NULL);
-	(void)memset(fv, 0, sizeof(struct flowvalve));
 
-	MALLOC(fv->fv_fves, struct fve *, sizeof(struct fve) * num,
-	       M_DEVBUF, M_WAITOK);
+	fv->fv_fves = malloc(sizeof(struct fve) * num, M_DEVBUF,
+	    M_WAITOK|M_ZERO);
 	if (fv->fv_fves == NULL) {
-		FREE(fv, M_DEVBUF);
+		free(fv, M_DEVBUF);
 		return (NULL);
 	}
-	(void)memset(fv->fv_fves, 0, sizeof(struct fve) * num);
 
 	fv->fv_flows = 0;
 	TAILQ_INIT(&fv->fv_flowlist);
@@ -1294,11 +1290,10 @@
 	fv->fv_pthresh = (FV_PSCALE(1) << FP_SHIFT) / rp->red_inv_pmax;
 
 	/* initialize drop rate to fraction table */
-	MALLOC(fv->fv_p2ftab, int *, sizeof(int) * BRTT_SIZE,
-	       M_DEVBUF, M_WAITOK);
+	fv->fv_p2ftab = malloc(sizeof(int) * BRTT_SIZE, M_DEVBUF, M_WAITOK);
 	if (fv->fv_p2ftab == NULL) {
-		FREE(fv->fv_fves, M_DEVBUF);
-		FREE(fv, M_DEVBUF);
+		free(fv->fv_fves, M_DEVBUF);
+		free(fv, M_DEVBUF);
 		return (NULL);
 	}
 	/*
@@ -1318,9 +1313,9 @@
 static void fv_destroy(fv)
 	struct flowvalve *fv;
 {
-	FREE(fv->fv_p2ftab, M_DEVBUF);
-	FREE(fv->fv_fves, M_DEVBUF);
-	FREE(fv, M_DEVBUF);
+	free(fv->fv_p2ftab, M_DEVBUF);
+	free(fv->fv_fves, M_DEVBUF);
+	free(fv, M_DEVBUF);
 }
 
 static inline int
--- a/sys/altq/altq_rio.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_rio.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_rio.c,v 1.8 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_rio.c,v 1.8.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_rio.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.8 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.8.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -82,6 +82,7 @@
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -246,7 +247,9 @@
 		if ((error = suser(p)) != 0)
 			return (error);
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 			return (error);
 #endif
 		break;
@@ -280,26 +283,24 @@
 		}
 
 		/* allocate and initialize rio_queue_t */
-		MALLOC(rqp, rio_queue_t *, sizeof(rio_queue_t), M_DEVBUF, M_WAITOK);
+		rqp = malloc(sizeof(rio_queue_t), M_DEVBUF, M_WAITOK|M_ZERO);
 		if (rqp == NULL) {
 			error = ENOMEM;
 			break;
 		}
-		(void)memset(rqp, 0, sizeof(rio_queue_t));
 
-		MALLOC(rqp->rq_q, class_queue_t *, sizeof(class_queue_t),
-		       M_DEVBUF, M_WAITOK);
+		rqp->rq_q = malloc(sizeof(class_queue_t), M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (rqp->rq_q == NULL) {
-			FREE(rqp, M_DEVBUF);
+			free(rqp, M_DEVBUF);
 			error = ENOMEM;
 			break;
 		}
-		(void)memset(rqp->rq_q, 0, sizeof(class_queue_t));
 
 		rqp->rq_rio = rio_alloc(0, NULL, 0, 0);
 		if (rqp->rq_rio == NULL) {
-			FREE(rqp->rq_q, M_DEVBUF);
-			FREE(rqp, M_DEVBUF);
+			free(rqp->rq_q, M_DEVBUF);
+			free(rqp, M_DEVBUF);
 			error = ENOMEM;
 			break;
 		}
@@ -318,8 +319,8 @@
 				    NULL, NULL);
 		if (error) {
 			rio_destroy(rqp->rq_rio);
-			FREE(rqp->rq_q, M_DEVBUF);
-			FREE(rqp, M_DEVBUF);
+			free(rqp->rq_q, M_DEVBUF);
+			free(rqp, M_DEVBUF);
 			break;
 		}
 
@@ -463,8 +464,8 @@
 	}
 
 	rio_destroy(rqp->rq_rio);
-	FREE(rqp->rq_q, M_DEVBUF);
-	FREE(rqp, M_DEVBUF);
+	free(rqp->rq_q, M_DEVBUF);
+	free(rqp, M_DEVBUF);
 	return (error);
 }
 
@@ -500,10 +501,9 @@
 	int	w, i;
 	int	npkts_per_sec;
 
-	MALLOC(rp, rio_t *, sizeof(rio_t), M_DEVBUF, M_WAITOK);
+	rp = malloc(sizeof(rio_t), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (rp == NULL)
 		return (NULL);
-	(void)memset(rp, 0, sizeof(rio_t));
 
 	rp->rio_flags = flags;
 	if (pkttime == 0)
@@ -588,7 +588,7 @@
 	rio_t *rp;
 {
 	wtab_destroy(rp->rio_wtab);
-	FREE(rp, M_DEVBUF);
+	free(rp, M_DEVBUF);
 }
 
 void
--- a/sys/altq/altq_rmclass.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_rmclass.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_rmclass.c,v 1.12 2006/02/25 02:28:56 wiz Exp $	*/
+/*	$NetBSD: altq_rmclass.c,v 1.12.2.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_rmclass.c,v 1.9 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.12 2006/02/25 02:28:56 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.12.2.1 2006/05/24 10:56:32 yamt Exp $");
 
 #ident "@(#)rm_class.c  1.48     97/12/05 SMI"
 
@@ -230,19 +230,15 @@
 	}
 #endif
 
-	MALLOC(cl, struct rm_class *, sizeof(struct rm_class),
-	       M_DEVBUF, M_WAITOK);
+	cl = malloc(sizeof(struct rm_class), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (cl == NULL)
 		return (NULL);
-	(void)memset(cl, 0, sizeof(struct rm_class));
 	CALLOUT_INIT(&cl->callout_);
-	MALLOC(cl->q_, class_queue_t *, sizeof(class_queue_t),
-	       M_DEVBUF, M_WAITOK);
+	cl->q_ = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (cl->q_ == NULL) {
-		FREE(cl, M_DEVBUF);
+		free(cl, M_DEVBUF);
 		return (NULL);
 	}
-	(void)memset(cl->q_, 0, sizeof(class_queue_t));
 
 	/*
 	 * Class initialization.
@@ -660,8 +656,8 @@
 			red_destroy(cl->red_);
 #endif
 	}
-	FREE(cl->q_, M_DEVBUF);
-	FREE(cl, M_DEVBUF);
+	free(cl->q_, M_DEVBUF);
+	free(cl, M_DEVBUF);
 }
 
 
--- a/sys/altq/altq_subr.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_subr.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_subr.c,v 1.13 2005/12/11 12:16:03 christos Exp $	*/
+/*	$NetBSD: altq_subr.c,v 1.13.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_subr.c,v 1.11 2002/01/11 08:11:49 kjc Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_subr.c,v 1.13 2005/12/11 12:16:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_subr.c,v 1.13.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -325,15 +325,13 @@
 		if ((tbr = ifq->altq_tbr) == NULL)
 			return (ENOENT);
 		ifq->altq_tbr = NULL;
-		FREE(tbr, M_DEVBUF);
+		free(tbr, M_DEVBUF);
 		return (0);
 	}
 
-	MALLOC(tbr, struct tb_regulator *, sizeof(struct tb_regulator),
-	       M_DEVBUF, M_WAITOK);
+	tbr = malloc(sizeof(struct tb_regulator), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (tbr == NULL)
 		return (ENOMEM);
-	(void)memset(tbr, 0, sizeof(struct tb_regulator));
 
 	tbr->tbr_rate = TBR_SCALE(profile->rate / 8) / machclk_freq;
 	tbr->tbr_depth = TBR_SCALE(profile->depth);
@@ -349,7 +347,7 @@
 	ifq->altq_tbr = tbr;	/* set the new tbr */
 
 	if (otbr != NULL)
-		FREE(otbr, M_DEVBUF);
+		free(otbr, M_DEVBUF);
 	else {
 		if (tbr_timer == 0) {
 			CALLOUT_RESET(&tbr_callout, 1, tbr_timeout, (void *)0);
@@ -762,11 +760,9 @@
 		return (EINVAL);
 #endif
 
-	MALLOC(afp, struct acc_filter *, sizeof(struct acc_filter),
-	       M_DEVBUF, M_WAITOK);
+	afp = malloc(sizeof(struct acc_filter), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (afp == NULL)
 		return (ENOMEM);
-	(void)memset(afp, 0, sizeof(struct acc_filter));
 
 	afp->f_filter = *filter;
 	afp->f_class = class;
@@ -881,7 +877,7 @@
 	LIST_REMOVE(afp, f_chain);
 	splx(s);
 
-	FREE(afp, M_DEVBUF);
+	free(afp, M_DEVBUF);
 
 	/* todo: update filt_bmask */
 
@@ -907,7 +903,7 @@
 			LIST_FOREACH(afp, &classifier->acc_filters[i], f_chain)
 				if (all || afp->f_class == class) {
 					LIST_REMOVE(afp, f_chain);
-					FREE(afp, M_DEVBUF);
+					free(afp, M_DEVBUF);
 					/* start again from the head */
 					break;
 				}
@@ -1329,8 +1325,7 @@
 
 	TAILQ_INIT(&ip4f_list);
 	for (i=0; i<IP4F_TABSIZE; i++) {
-		MALLOC(fp, struct ip4_frag *, sizeof(struct ip4_frag),
-		       M_DEVBUF, M_NOWAIT);
+		fp = malloc(sizeof(struct ip4_frag), M_DEVBUF, M_NOWAIT);
 		if (fp == NULL) {
 			printf("ip4f_init: can't alloc %dth entry!\n", i);
 			if (i == 0)
--- a/sys/altq/altq_wfq.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/altq/altq_wfq.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_wfq.c,v 1.9 2005/12/24 20:10:16 perry Exp $	*/
+/*	$NetBSD: altq_wfq.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 /*	$KAME: altq_wfq.c,v 1.7 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_wfq.c,v 1.9 2005/12/24 20:10:16 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_wfq.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include "opt_altq.h"
@@ -55,6 +55,7 @@
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -136,18 +137,14 @@
 	}
 
 	/* allocate and initialize wfq_state_t */
-	MALLOC(new_wfqp, wfq_state_t *, sizeof(wfq_state_t),
-	       M_DEVBUF, M_WAITOK);
+	new_wfqp = malloc(sizeof(wfq_state_t), M_DEVBUF, M_WAITOK|M_ZERO);
 	if (new_wfqp == NULL)
 		return (ENOMEM);
-	(void)memset(new_wfqp, 0, sizeof(wfq_state_t));
-	MALLOC(queue, wfq *, sizeof(wfq) * DEFAULT_QSIZE,
-	       M_DEVBUF, M_WAITOK);
+	queue = malloc(sizeof(wfq) * DEFAULT_QSIZE, M_DEVBUF, M_WAITOK|M_ZERO);
 	if (queue == NULL) {
-		FREE(new_wfqp, M_DEVBUF);
+		free(new_wfqp, M_DEVBUF);
 		return (ENOMEM);
 	}
-	(void)memset(queue, 0, sizeof(wfq) * DEFAULT_QSIZE);
 
 	/* keep the ifq */
 	new_wfqp->ifq = &ifp->if_snd;
@@ -172,8 +169,8 @@
 	if ((error = altq_attach(&ifp->if_snd, ALTQT_WFQ, new_wfqp,
 				 wfq_ifenqueue, wfq_ifdequeue, wfq_request,
 				 new_wfqp, wfq_classify)) != 0) {
-		FREE(queue, M_DEVBUF);
-		FREE(new_wfqp, M_DEVBUF);
+		free(queue, M_DEVBUF);
+		free(new_wfqp, M_DEVBUF);
 		return (error);
 	}
 
@@ -215,8 +212,8 @@
 	}
 
 	/* deallocate wfq_state_t */
-	FREE(wfqp->queue, M_DEVBUF);
-	FREE(wfqp, M_DEVBUF);
+	free(wfqp->queue, M_DEVBUF);
+	free(wfqp, M_DEVBUF);
 	return (error);
 }
 
@@ -580,13 +577,12 @@
 	if (cf->nqueues != wfqp->nums) {
 		/* free queued mbuf */
 		wfq_flush(wfqp->ifq);
-		FREE(wfqp->queue, M_DEVBUF);
+		free(wfqp->queue, M_DEVBUF);
 
-		MALLOC(queue, wfq *, sizeof(wfq) * cf->nqueues,
-		       M_DEVBUF, M_WAITOK);
+		queue = malloc(sizeof(wfq) * cf->nqueues, M_DEVBUF,
+		    M_WAITOK|M_ZERO);
 		if (queue == NULL)
 			return (ENOMEM);
-		(void)memset(queue, 0, sizeof(wfq) * cf->nqueues);
 
 		wfqp->nums = cf->nqueues;
 		wfqp->bytes = 0;
@@ -694,7 +690,9 @@
 #if (__FreeBSD_version > 400000)
 		if ((error = suser(p)) != 0)
 #else
-		if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+		if ((error = kauth_authorize_generic(p->p_cred,
+					       KAUTH_GENERIC_ISSUSER,
+					       &p->p_acflag)) != 0)
 #endif
 			return (error);
 		break;
--- a/sys/arch/acorn26/acorn26/vm_machdep.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/acorn26/acorn26/vm_machdep.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.10 2006/02/14 16:41:21 bjh21 Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.10.2.1 2006/05/24 10:56:32 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.10 2006/02/14 16:41:21 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.10.2.1 2006/05/24 10:56:32 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -215,7 +215,8 @@
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vmapbuf");
 	p = bp->b_proc;
-	faddr = trunc_page((vaddr_t)bp->b_saveaddr = bp->b_data);
+	bp->b_saveaddr = bp->b_data;
+	faddr = trunc_page((vaddr_t)bp->b_data);
 	off = (vaddr_t)bp->b_data - faddr;
 	len = round_page(off + len);
 	taddr = uvm_km_alloc(phys_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
--- a/sys/arch/acorn26/vidc/arcvideo.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/acorn26/vidc/arcvideo.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arcvideo.c,v 1.9 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: arcvideo.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $ */
 /*-
  * Copyright (c) 1998, 2000 Ben Harris
  * All rights reserved.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcvideo.c,v 1.9 2005/12/11 12:16:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcvideo.c,v 1.9.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -72,9 +72,9 @@
 static void arcvideo_await_vsync(struct device *self);
 #endif
 static int arcvideo_intr(void *cookie);
-static int arcvideo_ioctl(void *cookie, u_long cmd, caddr_t data,
+static int arcvideo_ioctl(void *cookie, void *vs, u_long cmd, caddr_t data,
 			       int flag, struct lwp *l);
-static paddr_t arcvideo_mmap(void *cookie, off_t off, int prot);
+static paddr_t arcvideo_mmap(void *cookie, void *vs, off_t off, int prot);
 static int arcvideo_alloc_screen(void *cookie, const struct wsscreen_descr *scr,
 				      void **scookiep, int *curxp, int *curyp,
 				      long *defattrp);
@@ -392,7 +392,7 @@
 /* wsdisplay access functions */
 
 static int
-arcvideo_ioctl(void *cookie, u_long cmd, caddr_t data, int flag,
+arcvideo_ioctl(void *cookie, void *vs, u_long cmd, caddr_t data, int flag,
     struct lwp *l)
 {
 	struct arcvideo_softc *sc = cookie;
@@ -426,7 +426,7 @@
 }
 
 static paddr_t
-arcvideo_mmap(void *cookie, off_t off, int prot)
+arcvideo_mmap(void *cookie, void *vs, off_t off, int prot)
 {
 
 	return ENODEV;
--- a/sys/arch/acorn32/mainbus/fd.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.24.2.1 2006/04/01 12:06:06 yamt Exp $	*/
+/*	$NetBSD: fd.c,v 1.24.2.2 2006/05/24 10:56:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.24.2.1 2006/04/01 12:06:06 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.24.2.2 2006/05/24 10:56:32 yamt Exp $");
 
 #include "opt_ddb.h"
 
@@ -1030,7 +1030,7 @@
 		fd->sc_cylin = -1;
 		fdc->sc_state = SEEKWAIT;
 
-		fd->sc_dk.dk_seek++;
+		iostat_seek(fd->sc_dk.dk_stats);
 		disk_busy(&fd->sc_dk);
 
 		callout_reset(&fdc->sc_timo_ch, 4 * hz, fdctimeout, fdc);
--- a/sys/arch/algor/algor/algor_p4032_intr.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/algor/algor_p4032_intr.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p4032_intr.c,v 1.10 2005/12/24 20:06:46 perry Exp $	*/
+/*	$NetBSD: algor_p4032_intr.c,v 1.10.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.10 2005/12/24 20:06:46 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.10.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #include "opt_ddb.h"
 
@@ -206,6 +206,18 @@
 
 #define	NINTRS			2	/* MIPS INT0 - INT1 */
 
+/*
+ * This is a mask of bits to clear in the SR when we go to a
+ * given software interrupt priority level.
+ * Hardware ipls are port/board specific.
+ */
+const uint32_t mips_ipl_si_to_sr[_IPL_NSOFT] = {
+	MIPS_SOFT_INT_MASK_0,			/* IPL_SOFT */
+	MIPS_SOFT_INT_MASK_0,			/* IPL_SOFTCLOCK */
+	MIPS_SOFT_INT_MASK_1,			/* IPL_SOFTNET */
+	MIPS_SOFT_INT_MASK_1,			/* IPL_SOFTSERIAL */
+};
+
 struct p4032_cpuintr {
 	LIST_HEAD(, algor_intrhand) cintr_list;
 	struct evcnt cintr_count;
--- a/sys/arch/algor/algor/algor_p5064_intr.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/algor/algor_p5064_intr.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p5064_intr.c,v 1.13 2005/12/24 20:06:46 perry Exp $	*/
+/*	$NetBSD: algor_p5064_intr.c,v 1.13.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.13 2005/12/24 20:06:46 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.13.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #include "opt_ddb.h"
 
@@ -276,6 +276,18 @@
 
 #define	NINTRS			3	/* MIPS INT0 - INT2 */
 
+/*
+ * This is a mask of bits to clear in the SR when we go to a
+ * given software interrupt priority level.
+ * Hardware ipls are port/board specific.
+ */
+const uint32_t mips_ipl_si_to_sr[_IPL_NSOFT] = {
+	MIPS_SOFT_INT_MASK_0,			/* IPL_SOFT */
+	MIPS_SOFT_INT_MASK_0,			/* IPL_SOFTCLOCK */
+	MIPS_SOFT_INT_MASK_1,			/* IPL_SOFTNET */
+	MIPS_SOFT_INT_MASK_1,			/* IPL_SOFTSERIAL */
+};
+
 struct p5064_cpuintr {
 	LIST_HEAD(, algor_intrhand) cintr_list;
 	struct evcnt cintr_count;
--- a/sys/arch/algor/algor/algor_p6032_intr.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/algor/algor_p6032_intr.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p6032_intr.c,v 1.7 2005/12/11 12:16:08 christos Exp $	*/
+/*	$NetBSD: algor_p6032_intr.c,v 1.7.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.7 2005/12/11 12:16:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.7.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #include "opt_ddb.h"
 
@@ -168,6 +168,18 @@
 
 #define	NINTRS			2	/* MIPS INT0 - INT1 */
 
+/*
+ * This is a mask of bits to clear in the SR when we go to a
+ * given software interrupt priority level.
+ * Hardware ipls are port/board specific.
+ */
+const uint32_t mips_ipl_si_to_sr[_IPL_NSOFT] = {
+	MIPS_SOFT_INT_MASK_0,			/* IPL_SOFT */
+	MIPS_SOFT_INT_MASK_0,			/* IPL_SOFTCLOCK */
+	MIPS_SOFT_INT_MASK_1,			/* IPL_SOFTNET */
+	MIPS_SOFT_INT_MASK_1,			/* IPL_SOFTSERIAL */
+};
+
 struct p6032_cpuintr {
 	LIST_HEAD(, algor_intrhand) cintr_list;
 	struct evcnt cintr_count;
--- a/sys/arch/algor/algor/autoconf.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/algor/autoconf.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.13 2006/02/23 17:32:14 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.13.2.1 2006/05/24 10:56:32 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.13 2006/02/23 17:32:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13.2.1 2006/05/24 10:56:32 yamt Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -112,12 +112,15 @@
 		struct pci_attach_args *pa = aux;
 
 		if (BUILTIN_ETHERNET_P(pa)) {
-			if (devprop_set(dev, "mac-addr",
-				     algor_ethaddr,
-				     ETHER_ADDR_LEN, 0, 0) != 0) {
+			prop_data_t pd = prop_data_create_data_nocopy(
+			    algor_ethaddr, ETHER_ADDR_LEN);
+			KASSERT(pd != NULL);
+			if (prop_dictionary_set(device_properties(dev),
+						"mac-addr", pd) == FALSE) {
 				printf("WARNING: unable to set mac-addr "
 				    "property for %s\n", dev->dv_xname);
 			}
+			prop_object_release(pd);
 #if defined(ALGOR_P4032)
 			/*
 			 * XXX This is gross, disgusting, and otherwise vile,
--- a/sys/arch/algor/algor/interrupt.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/algor/interrupt.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.7 2005/12/11 12:16:08 christos Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.7.8.1 2006/05/24 10:56:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,14 +37,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.7 2005/12/11 12:16:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.7.8.1 2006/05/24 10:56:32 yamt Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h" 
 #include "opt_algor_p6032.h"
 
 #include <sys/param.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 
 #include <uvm/uvm_extern.h>
@@ -70,8 +69,6 @@
 
 void	(*algor_iointr)(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
 
-struct algor_soft_intrhand *softnet_intrhand;
-
 u_long	cycles_per_hz;
 
 /*
@@ -129,8 +126,6 @@
 	MIPS_SOFT_INT_MASK_1,			/* IPL_SOFTSERIAL */
 };
 
-struct algor_soft_intr algor_soft_intrs[_IPL_NSOFT];
-
 struct evcnt mips_int5_evcnt =
     EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "mips", "int 5 (clock)");
 
@@ -153,9 +148,6 @@
 cpu_intr(u_int32_t status, u_int32_t cause, u_int32_t pc, u_int32_t ipending)
 {
 	struct clockframe cf;
-	struct algor_soft_intr *asi;
-	struct algor_soft_intrhand *sih;
-	int i, s;
 
 	uvmexp.intrs++;
 
@@ -187,107 +179,5 @@
 
 	_clrsoftintr(ipending);
 
-	for (i = _IPL_NSOFT - 1; i >= 0; i--) {
-		if ((ipending & ipl_si_to_sr[i]) == 0)
-			continue;
-
-		asi = &algor_soft_intrs[i];
-
-		if (TAILQ_FIRST(&asi->softintr_q) != NULL)
-			asi->softintr_evcnt.ev_count++;
-
-		for (;;) {
-			s = splhigh();
-
-			sih = TAILQ_FIRST(&asi->softintr_q);
-			if (sih != NULL) {
-				TAILQ_REMOVE(&asi->softintr_q, sih, sih_q);
-				sih->sih_pending = 0;
-			}
-
-			splx(s);
-
-			if (sih == NULL)
-				break;
-
-			uvmexp.softs++;
-			(*sih->sih_fn)(sih->sih_arg);
-		}
-	}
+	softintr_dispatch(ipending);
 }
-
-/*
- * softintr_init:
- *
- *	Initialize the software interrupt system.
- */
-void
-softintr_init(void)
-{
-	static const char *softintr_names[] = IPL_SOFTNAMES;
-	struct algor_soft_intr *asi;
-	int i;
-
-	for (i = 0; i < _IPL_NSOFT; i++) {
-		asi = &algor_soft_intrs[i];
-		TAILQ_INIT(&asi->softintr_q);
-		asi->softintr_ipl = IPL_SOFT + i;
-		evcnt_attach_dynamic(&asi->softintr_evcnt, EVCNT_TYPE_INTR,
-		    NULL, "soft", softintr_names[i]);
-	}
-
-	/* XXX Establish legacy soft interrupt handlers. */
-	softnet_intrhand = softintr_establish(IPL_SOFTNET,
-	    (void (*)(void *))netintr, NULL);
-
-	assert(softnet_intrhand != NULL);
-}
-
-/*
- * softintr_establish:		[interface]
- *
- *	Register a software interrupt handler.
- */
-void *
-softintr_establish(int ipl, void (*func)(void *), void *arg)
-{
-	struct algor_soft_intr *asi;
-	struct algor_soft_intrhand *sih;
-
-	if (__predict_false(ipl >= (IPL_SOFT + _IPL_NSOFT) ||
-			    ipl < IPL_SOFT))
-		panic("softintr_establish");
-
-	asi = &algor_soft_intrs[ipl - IPL_SOFT];
-
-	sih = malloc(sizeof(*sih), M_DEVBUF, M_NOWAIT);
-	if (__predict_true(sih != NULL)) {
-		sih->sih_intrhead = asi;
-		sih->sih_fn = func;
-		sih->sih_arg = arg;
-		sih->sih_pending = 0;
-	}
-	return (sih);
-}
-
-/*
- * softintr_disestablish:	[interface]
- *
- *	Unregister a software interrupt handler.
- */
-void
-softintr_disestablish(void *arg)
-{
-	struct algor_soft_intrhand *sih = arg;
-	struct algor_soft_intr *asi = sih->sih_intrhead;
-	int s;
-
-	s = splhigh();
-	if (sih->sih_pending) {
-		TAILQ_REMOVE(&asi->softintr_q, sih, sih_q);
-		sih->sih_pending = 0;
-	}
-	splx(s);
-
-	free(sih, M_DEVBUF);
-}
--- a/sys/arch/algor/conf/files.algor	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/conf/files.algor	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: files.algor,v 1.19 2005/12/11 12:16:08 christos Exp $
+#	$NetBSD: files.algor,v 1.19.8.1 2006/05/24 10:56:32 yamt Exp $
 
 # Algorithmics evaluation board specific configuration info.
 
@@ -42,6 +42,8 @@
 file	arch/algor/algor/machdep.c
 file	arch/algor/algor/pmon.c
 
+file	arch/mips/mips/softintr.c
+
 #
 # The autoconfiguration root.
 #
--- a/sys/arch/algor/include/intr.h	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/include/intr.h	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.4 2001/06/15 04:01:40 thorpej Exp $	*/
+/*	$NetBSD: intr.h,v 1.4.58.1 2006/05/24 10:56:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -122,54 +122,7 @@
 	const void *ih_irqmap;
 };
 
-#define	setsoft(x)							\
-do {									\
-	_setsoftintr(ipl_si_to_sr[(x) - IPL_SOFT]);			\
-} while (0)
-
-struct algor_soft_intrhand {
-	TAILQ_ENTRY(algor_soft_intrhand)
-		sih_q;
-	struct algor_soft_intr *sih_intrhead;
-	void	(*sih_fn)(void *);
-	void	*sih_arg;
-	int	sih_pending;
-};
-
-struct algor_soft_intr {
-	TAILQ_HEAD(, algor_soft_intrhand)
-		softintr_q;
-	struct evcnt softintr_evcnt;
-	struct simplelock softintr_slock;
-	unsigned long softintr_ipl;
-};
-
-void	*softintr_establish(int, void (*)(void *), void *);
-void	softintr_disestablish(void *);
-void	softintr_init(void);
-void	softintr_dispatch(void);
-
-#define	softintr_schedule(arg)						\
-do {									\
-	struct algor_soft_intrhand *__sih = (arg);			\
-	struct algor_soft_intr *__si = __sih->sih_intrhead;		\
-	int __s;							\
-									\
-	__s = splhigh();						\
-	simple_lock(&__si->softintr_slock);				\
-	if (__sih->sih_pending == 0) {					\
-		TAILQ_INSERT_TAIL(&__si->softintr_q, __sih, sih_q);	\
-		__sih->sih_pending = 1;					\
-		setsoft(__si->softintr_ipl);				\
-	}								\
-	simple_unlock(&__si->softintr_slock);				\
-	splx(__s);							\
-} while (0)
-
-/* XXX For legacy software interrupts. */
-extern struct algor_soft_intrhand *softnet_intrhand;
-
-#define	setsoftnet()	softintr_schedule(softnet_intrhand)
+#include <mips/softintr.h>
 
 extern struct evcnt mips_int5_evcnt;
 
--- a/sys/arch/algor/pci/pcib.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/algor/pci/pcib.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.17 2005/12/11 12:16:08 christos Exp $	*/
+/*	$NetBSD: pcib.c,v 1.17.8.1 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17 2005/12/11 12:16:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #include "opt_algor_p5064.h" 
 #include "opt_algor_p6032.h"
@@ -393,13 +393,13 @@
 		/* Send a specific EOI to the 8259. */
 		if (irq > 7) {
 			bus_space_write_1(sc->sc_iot, sc->sc_ioh_icu2,
-			    PIC_OCW2, OCW2_SELECT | OCW3_EOI | OCW3_SL |
+			    PIC_OCW2, OCW2_SELECT | OCW2_EOI | OCW2_SL |
 			    OCW2_ILS(irq & 7));
 			irq = 2;
 		}
 
 		bus_space_write_1(sc->sc_iot, sc->sc_ioh_icu1, PIC_OCW2,
-		    OCW2_SELECT | OCW3_EOI | OCW3_SL | OCW2_ILS(irq));
+		    OCW2_SELECT | OCW2_EOI | OCW2_SL | OCW2_ILS(irq));
 	}
 }
 
--- a/sys/arch/alpha/a12/a12dc.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/a12/a12dc.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: a12dc.c,v 1.14 2005/12/11 12:16:10 christos Exp $ */
+/* $NetBSD: a12dc.c,v 1.14.8.1 2006/05/24 10:56:33 yamt Exp $ */
 
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -64,7 +64,7 @@
 #ifndef BSIDE
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.14 2005/12/11 12:16:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.14.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,6 +77,7 @@
 #include <sys/uio.h>
 #include <sys/device.h>
 #include <sys/conf.h>
+#include <sys/kauth.h>
 
 #include <dev/cons.h>
 
@@ -163,7 +164,7 @@
 	/* note that we've attached the chipset; can't have 2 A12Cs. */
 	a12dcfound = 1;
 
-	printf(": driver %s\n", "$Revision: 1.14 $");
+	printf(": driver %s\n", "$Revision: 1.14.8.1 $");
 
 	tp = a12dc_tty[0] = ttymalloc();
 	tp->t_oproc = a12dcstart;
@@ -286,7 +287,7 @@
 
 	if ((tp->t_state & TS_ISOPEN) &&
 	    (tp->t_state & TS_XCLUDE) &&
-	    suser(p->p_ucred, &p->p_acflag) != 0)
+	    kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag) != 0)
 		return EBUSY;
 
 	s = spltty();
--- a/sys/arch/alpha/alpha/fp_complete.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/alpha/fp_complete.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fp_complete.c,v 1.9 2005/12/24 20:06:46 perry Exp $ */
+/* $NetBSD: fp_complete.c,v 1.9.8.1 2006/05/24 10:56:33 yamt Exp $ */
 
 /*-
  * Copyright (c) 2001 Ross Harvey
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: fp_complete.c,v 1.9 2005/12/24 20:06:46 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fp_complete.c,v 1.9.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #include "opt_compat_osf1.h"
 
@@ -635,7 +635,7 @@
 	if (!(a0 & 1))
 		return sig;
 /*
- * At this point we are somwhere in the trap shadow of one or more instruc-
+ * At this point we are somewhere in the trap shadow of one or more instruc-
  * tions that have trapped with software completion specified.  We have a mask
  * of the registers written by trapping instructions.
  * 
--- a/sys/arch/alpha/alpha/pmap.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/alpha/pmap.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.213.8.1 2006/04/11 11:53:25 yamt Exp $ */
+/* $NetBSD: pmap.c,v 1.213.8.2 2006/05/24 10:56:33 yamt Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -145,7 +145,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.213.8.1 2006/04/11 11:53:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.213.8.2 2006/05/24 10:56:33 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2812,8 +2812,19 @@
 	if (type == ALPHA_MMCSR_FOW) {
 		if (!(*pte & (user ? PG_UWE : PG_UWE | PG_KWE)))
 			panic("pmap_emulate_reference: write but unwritable");
+#if 0
 		if (!(*pte & PG_FOW))
 			panic("pmap_emulate_reference: write but not FOW");
+#else
+		if (!(*pte & PG_FOW)) {
+			printf("pmap_emulate_reference: write but not FOW");
+			printf("va=%p, pte=%lx\n", (void *)v, (long)*pte);
+			ALPHA_TBIS(v);
+			if (didlock)
+				PMAP_UNLOCK(pmap);
+			return 0;
+		}
+#endif
 	} else {
 		if (!(*pte & (user ? PG_URE : PG_URE | PG_KRE)))
 			panic("pmap_emulate_reference: !write but unreadable");
--- a/sys/arch/alpha/alpha/promcons.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/alpha/promcons.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: promcons.c,v 1.26 2005/12/11 12:16:10 christos Exp $ */
+/* $NetBSD: promcons.c,v 1.26.8.1 2006/05/24 10:56:33 yamt Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: promcons.c,v 1.26 2005/12/11 12:16:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promcons.c,v 1.26.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,6 +45,7 @@
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/conf.h>
+#include <sys/kauth.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -112,7 +113,8 @@
 
 		setuptimeout = 1;
 	} else if (tp->t_state&TS_XCLUDE &&
-		   suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0) {
+		   kauth_authorize_generic(l->l_proc->p_cred, KAUTH_GENERIC_ISSUSER,
+				     &l->l_proc->p_acflag) != 0) {
 		splx(s);
 		return EBUSY;
 	}
--- a/sys/arch/alpha/alpha/trap.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/alpha/trap.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.104.2.1 2006/04/01 12:06:06 yamt Exp $ */
+/* $NetBSD: trap.c,v 1.104.2.2 2006/05/24 10:56:33 yamt Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.104.2.1 2006/04/01 12:06:06 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.104.2.2 2006/05/24 10:56:33 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -110,6 +110,7 @@
 #include <sys/user.h>
 #include <sys/syscall.h>
 #include <sys/buf.h>
+#include <sys/kauth.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -545,10 +546,10 @@
 			ksi.ksi_trap = a1; /* MMCSR VALUE */
 			if (rv == ENOMEM) {
 				printf("UVM: pid %d (%s), uid %d killed: "
-				       "out of swap\n", l->l_proc->p_pid,
-				       l->l_proc->p_comm,
-				       l->l_proc->p_cred && l->l_proc->p_ucred ?
-				       l->l_proc->p_ucred->cr_uid : -1);
+				    "out of swap\n", l->l_proc->p_pid,
+				    l->l_proc->p_comm,
+				    l->l_proc->p_cred ?
+				    kauth_cred_geteuid(l->l_proc->p_cred) : -1);
 				ksi.ksi_signo = SIGKILL;
 			} else
 				ksi.ksi_signo = SIGSEGV;
@@ -1240,8 +1241,7 @@
  * Start a new LWP
  */
 void
-startlwp(arg)
-	void *arg;
+startlwp(void *arg)
 {
 	int err;
 	ucontext_t *uc = arg;
@@ -1255,6 +1255,7 @@
 #endif
 	pool_put(&lwp_uc_pool, uc);
 
+	KERNEL_PROC_UNLOCK(l);
 	userret(l);
 }
 
--- a/sys/arch/alpha/alpha/vm_machdep.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/alpha/vm_machdep.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.87 2005/12/11 12:16:10 christos Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.87.8.1 2006/05/24 10:56:33 yamt Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.87 2005/12/11 12:16:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.87.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -279,7 +279,8 @@
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vmapbuf");
 	p = bp->b_proc;
-	faddr = trunc_page((vaddr_t)bp->b_saveaddr = bp->b_data);
+	bp->b_saveaddr = bp->b_data;
+	faddr = trunc_page((vaddr_t)bp->b_data);
 	off = (vaddr_t)bp->b_data - faddr;
 	len = round_page(off + len);
 	taddr = uvm_km_alloc(phys_map, len, 0, UVM_KMF_VAONLY|UVM_KMF_WAITVA);
--- a/sys/arch/alpha/conf/GENERIC	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/conf/GENERIC	Wed May 24 10:56:32 2006 +0000
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.285.2.1 $"
+#ident 		"GENERIC-$Revision: 1.285.2.2 $"
 
 maxusers 32
 
@@ -78,6 +78,7 @@
 file-system	NFS		# Sun NFS-compatible file system client
 file-system	KERNFS		# Kernel variable file system (/kern)
 file-system	PROCFS		# Process file system (/proc)
+file-system	NULLFS		# Null file system layer
 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
@@ -349,6 +350,7 @@
 viaide* at	pci? dev ? function ?		# VIA/AMD/Nvidia IDE controllers
 pcscp*	at	pci? dev ? function ?		# AMD Am53c974 PCscsi-PCI
 ppb*	at	pci? dev ? function ?		# PCI-PCI Bridges
+re*	at	pci? dev ? function ?		# Realtek 8169 Ethernet
 rtk*	at	pci? dev ? function ?		# Realtek 8129/8139 Ethernet
 sio*	at	pci? dev ? function ?		# Intel PCI-ISA Bridges
 sip*	at	pci? dev ? function ?		# SiS 900 Ethernet
--- a/sys/arch/alpha/include/db_machdep.h	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/include/db_machdep.h	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.14.36.1 2006/04/11 11:53:25 yamt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.14.36.2 2006/05/24 10:56:33 yamt Exp $ */
 
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -45,7 +45,7 @@
 extern db_regs_t	*ddb_regp;	/* pointer to current register state */
 #define	DDB_REGS	(ddb_regp)
 
-#define	PC_REGS(regs)	((db_addr_t)(regs)->tf_regs[FRAME_PC])
+#define	PC_REGS(regs)	((regs)->tf_regs[FRAME_PC])
 
 #define	BKPT_ADDR(addr)	(addr)		/* breakpoint address */
 #define	BKPT_INST	0x00000080	/* breakpoint instruction */
--- a/sys/arch/alpha/pci/dwlpxreg.h	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/pci/dwlpxreg.h	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpxreg.h,v 1.9 1998/03/21 22:02:42 mjacob Exp $ */
+/* $NetBSD: dwlpxreg.h,v 1.9.82.1 2006/05/24 10:56:33 yamt Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -67,10 +67,10 @@
  * (lacking I/O Node ID and Hose Numbers)
  */
 
-#define	DWLPX_PCI_DENSE		0x000000000LL
-#define	DWLPX_PCI_SPARSE	0x100000000LL
-#define	DWLPX_PCI_IOSPACE	0x200000000LL
-#define	DWLPX_PCI_CONF		0x300000000LL
+#define	DWLPX_PCI_DENSE		0x000000000UL
+#define	DWLPX_PCI_SPARSE	0x100000000UL
+#define	DWLPX_PCI_IOSPACE	0x200000000UL
+#define	DWLPX_PCI_CONF		0x300000000UL
 
 /*
  * PCIA Interface Adapter Register Addresses (Offsets from Node Address)
@@ -80,26 +80,26 @@
  * per bus. I/O Hose and TLSB Node I/D offsets must be added separately.
  */
 
-#define	_PCIA_CTL	0x380000000LL	/* PCI 0 Bus Control */
-#define	_PCIA_MRETRY	0x380000080LL	/* PCI 0 Master Retry Limit */
-#define	_PCIA_GPR	0x380000100LL	/* PCI 0 General Purpose */
-#define	_PCIA_ERR	0x380000180LL	/* PCI 0 Error Summary */
-#define	_PCIA_FADR	0x380000200LL	/* PCI 0 Failing Address */
-#define	_PCIA_IMASK	0x380000280LL	/* PCI 0 Interrupt Mask */
-#define	_PCIA_DIAG	0x380000300LL	/* PCI 0 Diagnostic  */
-#define	_PCIA_IPEND	0x380000380LL	/* PCI 0 Interrupt Pending */
-#define	_PCIA_IPROG	0x380000400LL	/* PCI 0 Interrupt in Progress */
-#define	_PCIA_WMASK_A	0x380000480LL	/* PCI 0 Window Mask A */
-#define	_PCIA_WBASE_A	0x380000500LL	/* PCI 0 Window Base A */
-#define	_PCIA_TBASE_A	0x380000580LL	/* PCI 0 Window Translated Base A */
-#define	_PCIA_WMASK_B	0x380000600LL	/* PCI 0 Window Mask B */
-#define	_PCIA_WBASE_B	0x380000680LL	/* PCI 0 Window Base B */
-#define	_PCIA_TBASE_B	0x380000700LL	/* PCI 0 Window Translated Base B */
-#define	_PCIA_WMASK_C	0x380000780LL	/* PCI 0 Window Mask C */
-#define	_PCIA_WBASE_C	0x380000800LL	/* PCI 0 Window Base C */
-#define	_PCIA_TBASE_C	0x380000880LL	/* PCI 0 Window Translated Base C */
-#define	_PCIA_ERRVEC	0x380000900LL	/* PCI 0 Error Interrupt Vector */
-#define	_PCIA_DEVVEC	0x380001000LL	/* PCI 0 Device Interrupt Vector */
+#define	_PCIA_CTL	0x380000000UL	/* PCI 0 Bus Control */
+#define	_PCIA_MRETRY	0x380000080UL	/* PCI 0 Master Retry Limit */
+#define	_PCIA_GPR	0x380000100UL	/* PCI 0 General Purpose */
+#define	_PCIA_ERR	0x380000180UL	/* PCI 0 Error Summary */
+#define	_PCIA_FADR	0x380000200UL	/* PCI 0 Failing Address */
+#define	_PCIA_IMASK	0x380000280UL	/* PCI 0 Interrupt Mask */
+#define	_PCIA_DIAG	0x380000300UL	/* PCI 0 Diagnostic  */
+#define	_PCIA_IPEND	0x380000380UL	/* PCI 0 Interrupt Pending */
+#define	_PCIA_IPROG	0x380000400UL	/* PCI 0 Interrupt in Progress */
+#define	_PCIA_WMASK_A	0x380000480UL	/* PCI 0 Window Mask A */
+#define	_PCIA_WBASE_A	0x380000500UL	/* PCI 0 Window Base A */
+#define	_PCIA_TBASE_A	0x380000580UL	/* PCI 0 Window Translated Base A */
+#define	_PCIA_WMASK_B	0x380000600UL	/* PCI 0 Window Mask B */
+#define	_PCIA_WBASE_B	0x380000680UL	/* PCI 0 Window Base B */
+#define	_PCIA_TBASE_B	0x380000700UL	/* PCI 0 Window Translated Base B */
+#define	_PCIA_WMASK_C	0x380000780UL	/* PCI 0 Window Mask C */
+#define	_PCIA_WBASE_C	0x380000800UL	/* PCI 0 Window Base C */
+#define	_PCIA_TBASE_C	0x380000880UL	/* PCI 0 Window Translated Base C */
+#define	_PCIA_ERRVEC	0x380000900UL	/* PCI 0 Error Interrupt Vector */
+#define	_PCIA_DEVVEC	0x380001000UL	/* PCI 0 Device Interrupt Vector */
 
 
 #define	PCIA_CTL(hpc)		(_PCIA_CTL	+ (0x200000 * (hpc)))
@@ -125,13 +125,13 @@
 #define	PCIA_DEVVEC(hpc, subslot, ipin)	\
  (_PCIA_DEVVEC + (0x200000 * (hpc)) + ((subslot) * 0x200) + ((ipin-1) * 0x80))
 
-#define	PCIA_SCYCLE	0x380002000LL	/* PCI Special Cycle */
-#define	PCIA_IACK	0x380002080LL	/* PCI Interrupt Acknowledge */
+#define	PCIA_SCYCLE	0x380002000UL	/* PCI Special Cycle */
+#define	PCIA_IACK	0x380002080UL	/* PCI Interrupt Acknowledge */
 
-#define	PCIA_PRESENT	0x380800000LL	/* PCI Slot Present */
-#define	PCIA_TBIT	0x380A00000LL	/* PCI TBIT */
-#define	PCIA_MCTL	0x380C00000LL	/* PCI Module Control */
-#define	PCIA_IBR	0x380E00000LL	/* PCI Information Base Repair */
+#define	PCIA_PRESENT	0x380800000UL	/* PCI Slot Present */
+#define	PCIA_TBIT	0x380A00000UL	/* PCI TBIT */
+#define	PCIA_MCTL	0x380C00000UL	/* PCI Module Control */
+#define	PCIA_IBR	0x380E00000UL	/* PCI Information Base Repair */
 
 /*
  * Bits in PCIA_CTL register
--- a/sys/arch/alpha/pci/mcpciareg.h	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/alpha/pci/mcpciareg.h	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpciareg.h,v 1.6 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: mcpciareg.h,v 1.6.8.1 2006/05/24 10:56:33 yamt Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -139,12 +139,12 @@
  * Address Space Cookies
  */
 
-#define	MCPCIA_PCI_SPARSE	0x000000000LL
-#define	MCPCIA_PCI_DENSE	0x100000000LL
-#define	MCPCIA_PCI_IOSPACE	0x180000000LL
-#define	MCPCIA_PCI_CONF		0x1C0000000LL
-#define	MCPCIA_PCI_BRIDGE	0x1E0000000LL
-#define	MCPCIA_PCI_IACK		0x1F0000000LL
+#define	MCPCIA_PCI_SPARSE	0x000000000UL
+#define	MCPCIA_PCI_DENSE	0x100000000UL
+#define	MCPCIA_PCI_IOSPACE	0x180000000UL
+#define	MCPCIA_PCI_CONF		0x1C0000000UL
+#define	MCPCIA_PCI_BRIDGE	0x1E0000000UL
+#define	MCPCIA_PCI_IACK		0x1F0000000UL
 
 /*
  * MCPCIA Bus Bridge Registers
--- a/sys/arch/amd64/amd64/fpu.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/amd64/amd64/fpu.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.13 2005/12/11 12:16:21 christos Exp $	*/
+/*	$NetBSD: fpu.c,v 1.13.8.1 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.13 2005/12/11 12:16:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.13.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -119,6 +119,8 @@
 
 #define	fninit()		__asm("fninit")
 #define fwait()			__asm("fwait")
+#define fnclex()		__asm("fnclex")
+#define	fnstsw(addr)		__asm("fnstsw %0" : "=m" (*addr))
 #define	fxsave(addr)		__asm("fxsave %0" : "=m" (*addr))
 #define	fxrstor(addr)		__asm("fxrstor %0" : : "m" (*addr))
 #define fldcw(addr)		__asm("fldcw %0" : : "m" (*addr))
@@ -276,8 +278,29 @@
 		mxcsr = l->l_addr->u_pcb.pcb_savefpu.fp_fxsave.fx_mxcsr;
 		ldmxcsr(&mxcsr);
 		l->l_md.md_flags |= MDP_USEDFPU;
-	} else
+	} else {
+		/*
+		 * AMD FPU's do not restore FIP, FDP, and FOP on fxrstor,
+		 * leaking other process's execution history. Clear them
+		 * manually.
+		 */
+		static const double zero = 0.0;
+		int status;
+		/*
+		 * Clear the ES bit in the x87 status word if it is currently
+		 * set, in order to avoid causing a fault in the upcoming load.
+		 */
+		fnstsw(&status);
+		if (status & 0x80)
+			fnclex();
+		/*
+		 * Load the dummy variable into the x87 stack.  This mangles
+		 * the x87 stack, but we don't care since we're about to call
+		 * fxrstor() anyway.
+		 */
+		__asm __volatile("ffree %%st(7)\n\tfld %0" : : "m" (zero));
 		fxrstor(&l->l_addr->u_pcb.pcb_savefpu);
+	}
 }
 
 
@@ -349,17 +372,15 @@
 #ifdef DIAGNOSTIC
 		spincount = 0;
 #endif
-		while (l->l_addr->u_pcb.pcb_fpcpu != NULL)
+		while (l->l_addr->u_pcb.pcb_fpcpu != NULL) {
 #ifdef DIAGNOSTIC
-		{
 			spincount++;
 			if (spincount > 10000000) {
 				panic("fp_save ipi didn't");
 			}
+#endif
+			__insn_barrier();
 		}
-#else
-		__insn_barrier();
-#endif
 	}
 #else
 	KASSERT(ci->ci_fpcurlwp == l);
--- a/sys/arch/amd64/amd64/locore.S	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/amd64/amd64/locore.S	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.15 2005/12/11 12:16:21 christos Exp $	*/
+/*	$NetBSD: locore.S,v 1.15.8.1 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -746,8 +746,8 @@
 #endif /* DIAGNOSTIC */
 
 /*
- * int cpu_switch(struct proc *)
- * Find a runnable process and switch to it.  Wait if necessary.  If the new
+ * int cpu_switch(struct lwp *)
+ * Find a runnable lwp and switch to it.  Wait if necessary.  If the new
  * lwp is the same as the old one, we short-circuit the context save and
  * restore.
  */
@@ -776,9 +776,9 @@
 	 *
 	 * Registers:
 	 *   %rax - queue head, scratch, then zero
-	 *   %r8 - queue number
+	 *   %r8  - queue number
 	 *   %ecx - cached value of whichqs
-	 *   %rdx - next process in queue
+	 *   %rdx - next lwp in queue
 	 *   %r13 - old lwp
 	 *   %r12 - new lwp
 	 */
--- a/sys/arch/amd64/amd64/mem.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/amd64/amd64/mem.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.5 2005/12/11 12:16:21 christos Exp $	*/
+/*	$NetBSD: mem.c,v 1.5.8.1 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.5 2005/12/11 12:16:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.5.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -92,6 +92,7 @@
 #ifdef LKM
 #include <sys/lkm.h>
 #endif
+#include <sys/kauth.h>
 
 #include <machine/cpu.h>
 
@@ -238,7 +239,7 @@
 	if (minor(dev) != DEV_MEM)
 		return (-1);
 
-	if (off > ctob(physmem) && suser(p->p_ucred, &p->p_acflag) != 0)
+	if (off > ctob(physmem) && kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag) != 0)
 		return (-1);
 	return (x86_btop(off));
 }
--- a/sys/arch/amd64/amd64/netbsd32_machdep.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/amd64/amd64/netbsd32_machdep.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.20.6.2 2006/04/01 12:06:07 yamt Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.20.6.3 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.20.6.2 2006/04/01 12:06:07 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.20.6.3 2006/05/24 10:56:33 yamt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_execfmt.h"
@@ -55,6 +55,7 @@
 #include <sys/vnode.h>
 #include <sys/ras.h>
 #include <sys/ptrace.h>
+#include <sys/kauth.h>
 
 #include <machine/fpu.h>
 #include <machine/frame.h>
@@ -613,7 +614,7 @@
 	if (mtrr_funcs == NULL)
 		return ENOSYS;
 
-	error = suser(p->p_ucred, &p->p_acflag);
+	error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag);
 	if (error != 0)
 		return error;
 
@@ -680,7 +681,7 @@
 	if (mtrr_funcs == NULL)
 		return ENOSYS;
 
-	error = suser(p->p_ucred, &p->p_acflag);
+	error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag);
 	if (error != 0)
 		return error;
 
--- a/sys/arch/amd64/amd64/pmap.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/amd64/amd64/pmap.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.24 2005/12/24 20:06:47 perry Exp $	*/
+/*	$NetBSD: pmap.c,v 1.24.8.1 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*
  *
@@ -108,7 +108,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.24 2005/12/24 20:06:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.24.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #ifndef __x86_64__
 #include "opt_cputype.h"
@@ -559,10 +559,6 @@
 #define PMAP_REMOVE_ALL		0	/* remove all mappings */
 #define PMAP_REMOVE_SKIPWIRED	1	/* skip wired mappings */
 
-static vaddr_t		 pmap_tmpmap_pa __P((paddr_t));
-static pt_entry_t	*pmap_tmpmap_pvepte __P((struct pv_entry *));
-static void		 pmap_tmpunmap_pa __P((void));
-static void		 pmap_tmpunmap_pvepte __P((struct pv_entry *));
 static void		pmap_unmap_ptes __P((struct pmap *));
 static boolean_t	pmap_get_physpage __P((vaddr_t, int, paddr_t *));
 static boolean_t	pmap_pdes_valid __P((vaddr_t, pd_entry_t **,
@@ -601,90 +597,6 @@
 	    (pmap->pm_cpus & (1U << cpu_num)) != 0);
 }
 
-/*
- * pmap_tmpmap_pa: map a page in for tmp usage
- */
-
-inline static vaddr_t
-pmap_tmpmap_pa(pa)
-	paddr_t pa;
-{
-#ifdef MULTIPROCESSOR
-	int id = cpu_number();
-#endif
-	pt_entry_t *ptpte = PTESLEW(ptp_pte, id);
-	caddr_t ptpva = VASLEW(ptpp, id);
-#if defined(DIAGNOSTIC)
-	if (*ptpte)
-		panic("pmap_tmpmap_pa: ptp_pte in use?");
-#endif
-	*ptpte = PG_V | PG_RW | pa;		/* always a new mapping */
-	return((vaddr_t)ptpva);
-}
-
-/*
- * pmap_tmpunmap_pa: unmap a tmp use page (undoes pmap_tmpmap_pa)
- */
-
-inline static void
-pmap_tmpunmap_pa()
-{
-#ifdef MULTIPROCESSOR
-	int id = cpu_number();
-#endif
-	pt_entry_t *ptpte = PTESLEW(ptp_pte, id);
-	caddr_t ptpva = VASLEW(ptpp, id);
-#if defined(DIAGNOSTIC)
-	if (!pmap_valid_entry(*ptp_pte))
-		panic("pmap_tmpunmap_pa: our pte invalid?");
-#endif
-	*ptpte = 0;		/* zap! */
-	pmap_update_pg((vaddr_t)ptpva);
-#ifdef MULTIPROCESSOR
-	/*
-	 * No need for tlb shootdown here, since ptp_pte is per-CPU.
-	 */
-#endif  
-}
-
-/*
- * pmap_tmpmap_pvepte: get a quick mapping of a PTE for a pv_entry
- *
- * => do NOT use this on kernel mappings [why?  because pv_ptp may be NULL]
- */
-
-inline static pt_entry_t *
-pmap_tmpmap_pvepte(pve)
-	struct pv_entry *pve;
-{
-#ifdef DIAGNOSTIC
-	if (pve->pv_pmap == pmap_kernel())
-		panic("pmap_tmpmap_pvepte: attempt to map kernel");
-#endif
-
-	/* is it current pmap?  use direct mapping... */
-	if (pmap_is_curpmap(pve->pv_pmap))
-		return(vtopte(pve->pv_va));
-
-	return(((pt_entry_t *)pmap_tmpmap_pa(VM_PAGE_TO_PHYS(pve->pv_ptp)))
-	       + ptei((unsigned long)pve->pv_va));
-}
-
-/*
- * pmap_tmpunmap_pvepte: release a mapping obtained with pmap_tmpmap_pvepte
- */
-
-inline static void
-pmap_tmpunmap_pvepte(pve)
-	struct pv_entry *pve;
-{
-	/* was it current pmap?   if so, return */
-	if (pmap_is_curpmap(pve->pv_pmap))
-		return;
-
-	pmap_tmpunmap_pa();
-}
-
 inline static void
 pmap_apte_flush(struct pmap *pmap)
 {
@@ -2415,6 +2327,9 @@
 	pt_entry_t opte;
 	int bank, off;
 
+	off = 0; /* XXX: GCC4 turns up "uninitialised" w/ -march=nocona -O2 */
+
+
 	/*
 	 * note that ptpva points to the PTE that maps startva.   this may
 	 * or may not be the first PTE in the PTP.
@@ -2508,6 +2423,8 @@
 	int bank, off;
 	struct pv_entry *pve;
 
+	off = 0; /* XXX: GCC4 turns up "uninitialised" w/ -march=nocona -O2 */
+
 	if (!pmap_valid_entry(*pte))
 		return(FALSE);		/* VA not mapped */
 	if ((flags & PMAP_REMOVE_SKIPWIRED) && (*pte & PG_W)) {
@@ -3115,6 +3032,8 @@
 
 	KASSERT(pmap_initialized);
 
+	off = 0; /* XXX: GCC4 turns up "uninitialised" w/ -march=nocona -O2 */
+
 #ifdef DIAGNOSTIC
 	if (va == (vaddr_t) PDP_BASE || va == (vaddr_t) APDP_BASE)
 		panic("pmap_enter: trying to map over PDP/APDP!");
--- a/sys/arch/amd64/amd64/sys_machdep.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/amd64/amd64/sys_machdep.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.5 2005/12/11 12:16:21 christos Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.5.8.1 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.5 2005/12/11 12:16:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.5.8.1 2006/05/24 10:56:33 yamt Exp $");
 
 #if 0
 #include "opt_user_ldt.h"
@@ -58,6 +58,7 @@
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/uio.h>
+#include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/signal.h>
@@ -395,7 +396,7 @@
 	if (securelevel > 1)
 		return EPERM;
 
-	if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+	if ((error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag)) != 0)
 		return error;
 
 	if ((error = copyin(args, &ua, sizeof(ua))) != 0)
@@ -440,7 +441,7 @@
 	if (securelevel > 1)
 		return EPERM;
 
-	if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+	if ((error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag)) != 0)
 		return error;
 
 	if ((error = copyin(args, &ua, sizeof(ua))) != 0)
@@ -487,7 +488,7 @@
 	if (mtrr_funcs == NULL)
 		return ENOSYS;
 
-	error = suser(p->p_ucred, &p->p_acflag);
+	error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag);
 	if (error != 0)
 		return error;
 
--- a/sys/arch/amd64/amd64/trap.c	Tue Apr 11 12:20:51 2006 +0000
+++ b/sys/arch/amd64/amd64/trap.c	Wed May 24 10:56:32 2006 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.22.8.1 2006/04/01 12:06:07 yamt Exp $	*/
+/*	$NetBSD: trap.c,v 1.22.8.2 2006/05/24 10:56:33 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.22.8.1 2006/04/01 12:06:07 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.22.8.2 2006/05/24 10:56:33 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -89,6 +89,7 @@
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/acct.h>
+#include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/syscall.h>
@@ -379,6 +380,7 @@
 			preempt(0);
 		goto out;
 
+#if 0 /* handled by fpudna() */
 	case T_DNA|T_USER: {
 		printf("pid %d killed due to lack of floating point\n",
 		    p->p_pid);