details: https://anonhg.NetBSD.org/src/rev/e01b53085c5c
branches: nick-nhusb
changeset: 804652:e01b53085c5c
user: skrll <skrll%NetBSD.org@localhost>
date: Sun May 29 08:44:15 2016 +0000
description:
Sync with HEAD
diffstat:
sys/altq/altq_rio.c | 21 +-
sys/altq/altq_subr.c | 23 +-
sys/arch/aarch64/conf/Makefile.aarch64 | 12 +-
sys/arch/amd64/amd64/locore.S | 422 +-
sys/arch/amd64/amd64/machdep.c | 7 +-
sys/arch/amd64/amd64/mptramp.S | 111 +-
sys/arch/amd64/conf/ALL | 11 +-
sys/arch/amd64/conf/GENERIC | 11 +-
sys/arch/amd64/conf/XEN3_DOM0 | 10 +-
sys/arch/amd64/conf/XEN3_DOMU | 6 +-
sys/arch/amd64/conf/kern.ldscript | 32 +-
sys/arch/amd64/conf/kern.ldscript.2MB | 69 -
sys/arch/amd64/conf/kern.ldscript.Xen | 113 +-
sys/arch/amd64/conf/largepages.inc | 7 -
sys/arch/amd64/include/pmap.h | 23 +-
sys/arch/amd64/include/pte.h | 56 +-
sys/arch/arm/allwinner/awin_gpio.c | 199 +-
sys/arch/arm/allwinner/awin_io.c | 6 +-
sys/arch/arm/allwinner/awin_lradc.c | 346 +
sys/arch/arm/allwinner/awin_reg.h | 43 +-
sys/arch/arm/allwinner/files.awin | 9 +-
sys/arch/arm/arm32/arm32_machdep.c | 9 +-
sys/arch/arm/imx/files.imx6 | 4 +-
sys/arch/arm/imx/files.imx7 | 99 +
sys/arch/arm/imx/if_enet.c | 259 +-
sys/arch/arm/imx/if_enet_imx6.c | 109 +
sys/arch/arm/imx/if_enet_imx7.c | 169 +
sys/arch/arm/imx/if_enetreg.h | 47 +-
sys/arch/arm/imx/if_enetvar.h | 135 +
sys/arch/arm/imx/imx6_reg.h | 3 +-
sys/arch/arm/imx/imx6_snvs.c | 172 +-
sys/arch/arm/imx/imx7_axi.c | 158 +
sys/arch/arm/imx/imx7_board.c | 244 +
sys/arch/arm/imx/imx7_ccm.c | 1543 +
sys/arch/arm/imx/imx7_ccmreg.h | 5257 +
sys/arch/arm/imx/imx7_ccmvar.h | 159 +
sys/arch/arm/imx/imx7_gpcreg.h | 160 +
sys/arch/arm/imx/imx7_gpio.c | 113 +
sys/arch/arm/imx/imx7_intr.h | 169 +
sys/arch/arm/imx/imx7_iomux.c | 188 +
sys/arch/arm/imx/imx7_iomuxreg.h | 614 +
sys/arch/arm/imx/imx7_ocotp.c | 124 +
sys/arch/arm/imx/imx7_ocotpreg.h | 112 +
sys/arch/arm/imx/imx7_ocotpvar.h | 34 +
sys/arch/arm/imx/imx7_snvs.c | 69 +
sys/arch/arm/imx/imx7_srcreg.h | 76 +
sys/arch/arm/imx/imx7_uart.c | 71 +
sys/arch/arm/imx/imx7_usb.c | 241 +
sys/arch/arm/imx/imx7_usbreg.h | 106 +
sys/arch/arm/imx/imx7_usdhc.c | 222 +
sys/arch/arm/imx/imx7_wdog.c | 65 +
sys/arch/arm/imx/imx7reg.h | 202 +
sys/arch/arm/imx/imx7var.h | 140 +
sys/arch/arm/imx/imxsnvs.c | 195 +
sys/arch/arm/imx/imxsnvsreg.h | 88 +
sys/arch/arm/imx/imxsnvsvar.h | 38 +
sys/arch/arm/imx/imxusb.c | 18 +-
sys/arch/arm/imx/imxusbreg.h | 5 +-
sys/arch/arm/imx/imxusbvar.h | 6 +-
sys/arch/arm/include/armreg.h | 9 +-
sys/arch/arm/nvidia/tegra_ehci.c | 8 +-
sys/arch/arm/omap/obio_wdt.c | 15 +-
sys/arch/arm/omap/omap2_obio.c | 9 +-
sys/arch/arm/omap/omap2_obiovar.h | 4 +-
sys/arch/arm/omap/omap2_reg.h | 8 +-
sys/arch/arm/omap/omap3_scm.c | 45 +-
sys/arch/arm/omap/omap3_sdhc.c | 7 +-
sys/arch/evbarm/awin/awin_machdep.c | 61 +-
sys/arch/evbarm/conf/ARMADILLO-IOT-G3 | 420 +
sys/arch/evbarm/conf/ARMADILLO-IOT-G3_INSTALL | 11 +
sys/arch/evbarm/conf/CUBIEBOARD | 5 +-
sys/arch/evbarm/conf/GENERIC.common | 27 +-
sys/arch/evbarm/conf/files.imx7 | 13 +
sys/arch/evbarm/conf/files.rpi | 3 +-
sys/arch/evbarm/conf/mk.imx7 | 33 +
sys/arch/evbarm/conf/std.imx7 | 35 +
sys/arch/evbarm/imx7/genassym.cf | 59 +
sys/arch/evbarm/imx7/imx7_ioconfig.c | 284 +
sys/arch/evbarm/imx7/imx7_machdep.c | 300 +
sys/arch/evbarm/imx7/imx7_start.S | 328 +
sys/arch/evbarm/imx7/platform.h | 59 +
sys/arch/evbarm64/conf/std.a64emul | 4 +-
sys/arch/evbarm64/conf/std.evbarm64 | 4 +-
sys/arch/hppa/conf/majors.hppa | 4 +-
sys/arch/i386/conf/ALL | 9 +-
sys/arch/i386/conf/GENERIC | 11 +-
sys/arch/i386/conf/kern.ldscript | 25 +-
sys/arch/i386/conf/kern.ldscript.4MB | 133 +-
sys/arch/i386/conf/kern.ldscript.Xen | 121 +-
sys/arch/i386/i386/copy.S | 84 +-
sys/arch/i386/i386/locore.S | 492 +-
sys/arch/i386/i386/machdep.c | 8 +-
sys/arch/i386/i386/mptramp.S | 235 +-
sys/arch/i386/include/asm.h | 3 +-
sys/arch/i386/stand/misc/rawr32.exe.uue | 61041 +++++----
sys/arch/ia64/ia64/ssc.c | 3 +-
sys/arch/macppc/conf/GENERIC | 6 +-
sys/arch/macppc/dev/ofb.c | 11 +-
sys/arch/macppc/dev/pbms.c | 4 +-
sys/arch/mips/cavium/dev/octeon_dwctwo.c | 6 +-
sys/arch/mips/cavium/dev/octeon_usbcvar.h | 9 +-
sys/arch/powerpc/pic/intr.c | 16 +-
sys/arch/powerpc/pic/ipi_openpic.c | 14 +-
sys/arch/powerpc/pic/pic_openpic.c | 6 +-
sys/arch/prep/stand/boot/siop.c | 6 +-
sys/arch/sparc/conf/files.sparc | 4 +-
sys/arch/sparc/dev/cgfourteen.c | 289 +-
sys/arch/sparc/dev/cgfourteenvar.h | 3 +-
sys/arch/sparc/dev/sxreg.h | 4 +-
sys/arch/sparc/include/psl.h | 6 +-
sys/arch/sparc/stand/Makefile.inc | 3 +-
sys/arch/sparc64/conf/GENERIC | 140 +-
sys/arch/sparc64/conf/GENERIC.DEBUG | 6 +-
sys/arch/sparc64/conf/GENERIC.UP | 6 +-
sys/arch/sparc64/conf/GENERIC32 | 8 +-
sys/arch/sparc64/conf/GENERIC32.UP | 8 +-
sys/arch/sparc64/conf/INSTALL | 6 +-
sys/arch/sparc64/conf/MODULAR | 16 +-
sys/arch/sparc64/conf/NONPLUS | 12 +-
sys/arch/sparc64/conf/NONPLUS64 | 22 +-
sys/arch/sparc64/dev/ebus_mainbus.c | 8 +-
sys/arch/sparc64/dev/fhc.c | 9 +-
sys/arch/sparc64/dev/psycho.c | 11 +-
sys/arch/sparc64/dev/pyro.c | 8 +-
sys/arch/sparc64/dev/sbus.c | 12 +-
sys/arch/sparc64/dev/schizo.c | 14 +-
sys/arch/sparc64/dev/vpci.c | 44 +-
sys/arch/sparc64/doc/TODO | 8 +-
sys/arch/sparc64/include/cpu.h | 4 +-
sys/arch/sparc64/include/proc.h | 5 +-
sys/arch/sparc64/include/psl.h | 6 +-
sys/arch/sparc64/sparc64/clock.c | 32 +-
sys/arch/sparc64/sparc64/db_interface.c | 13 +-
sys/arch/sparc64/sparc64/genassym.cf | 29 +-
sys/arch/sparc64/sparc64/intr.c | 32 +-
sys/arch/sparc64/sparc64/locore.s | 243 +-
sys/arch/sparc64/sparc64/machdep.c | 10 +-
sys/arch/sparc64/sparc64/mp_subr.S | 3 +-
sys/arch/sparc64/sparc64/trap.c | 34 +-
sys/arch/vax/include/bus.h | 11 +-
sys/arch/vax/uba/uba_mainbus.c | 6 +-
sys/arch/x86/include/cacheinfo.h | 4 +-
sys/arch/x86/include/specialreg.h | 25 +-
sys/arch/x86/x86/db_memrw.c | 10 +-
sys/arch/x86/x86/pmap.c | 90 +-
sys/arch/x86/x86/procfs_machdep.c | 17 +-
sys/arch/x86/x86/vmt.c | 7 +-
sys/arch/xen/conf/files.xen | 8 +-
sys/arch/xen/xen/xennetback_xenbus.c | 9 +-
sys/compat/common/uipc_syscalls_40.c | 35 +-
sys/compat/linux/common/linux_futex.c | 121 +-
sys/compat/linux/common/linux_socket.c | 53 +-
sys/compat/linux32/common/linux32_socket.c | 51 +-
sys/compat/netbsd32/netbsd32_netbsd.c | 66 +-
sys/compat/svr4/svr4_sockio.c | 14 +-
sys/compat/svr4_32/svr4_32_sockio.c | 11 +-
sys/conf/files | 17 +-
sys/conf/majors | 23 +-
sys/dev/DEVNAMES | 3 +-
sys/dev/ata/ld_ataraid.c | 16 +-
sys/dev/dkwedge/dk.c | 21 +-
sys/dev/dkwedge/dkwedge_gpt.c | 9 +-
sys/dev/fdt/fdt_intr.c | 7 +-
sys/dev/gpio/gpio.c | 79 +-
sys/dev/gpio/gpiovar.h | 15 +-
sys/dev/ic/ahcisata_core.c | 15 +-
sys/dev/ic/ath.c | 8 +-
sys/dev/ic/athn.c | 6 +-
sys/dev/ic/atw.c | 8 +-
sys/dev/ic/awi.c | 6 +-
sys/dev/ic/bwi.c | 8 +-
sys/dev/ic/com.c | 45 +-
sys/dev/ic/comreg.h | 10 +-
sys/dev/ic/comvar.h | 14 +-
sys/dev/ic/gem.c | 18 +-
sys/dev/ic/hd64570.c | 8 +-
sys/dev/ic/ld_nvme.c | 236 +
sys/dev/ic/malo.c | 8 +-
sys/dev/ic/mpt_netbsd.c | 34 +-
sys/dev/ic/mvsata.c | 14 +-
sys/dev/ic/ns16550reg.h | 9 +-
sys/dev/ic/nvme.c | 1291 +
sys/dev/ic/nvmereg.h | 387 +
sys/dev/ic/nvmevar.h | 180 +
sys/dev/ic/rt2560.c | 8 +-
sys/dev/ic/rt2661.c | 8 +-
sys/dev/ic/rt2860.c | 3822 +
sys/dev/ic/rt2860reg.h | 617 +-
sys/dev/ic/rt2860var.h | 215 +
sys/dev/ic/rtw.c | 10 +-
sys/dev/ic/siisata.c | 15 +-
sys/dev/ic/sl811hs.c | 292 +-
sys/dev/ic/wdc.c | 30 +-
sys/dev/ic/wi.c | 8 +-
sys/dev/microcode/ral/Makefile | 4 +-
sys/dev/microcode/ral/build.c | 3 +-
sys/dev/microcode/ral/microcode.h | 755 +-
sys/dev/microcode/ral/ral-rt2860 | Bin
sys/dev/pci/agp_i810.c | 51 +-
sys/dev/pci/agpreg.h | 8 +-
sys/dev/pci/arcmsr.c | 27 +-
sys/dev/pci/cxgb/cxgb_osdep.h | 4 +-
sys/dev/pci/files.pci | 6 +-
sys/dev/pci/if_bge.c | 9 +-
sys/dev/pci/if_iwm.c | 6 +-
sys/dev/pci/if_iwn.c | 6 +-
sys/dev/pci/if_lmc.c | 6 +-
sys/dev/pci/if_lmc.h | 4 +-
sys/dev/pci/if_ral_pci.c | 159 +-
sys/dev/pci/if_rtwn.c | 8 +-
sys/dev/pci/if_vioif.c | 7 +-
sys/dev/pci/if_wm.c | 1199 +-
sys/dev/pci/if_wmreg.h | 23 +-
sys/dev/pci/if_wmvar.h | 3 +-
sys/dev/pci/if_wpi.c | 8 +-
sys/dev/pci/mpii.c | 18 +-
sys/dev/pci/nvme_pci.c | 422 +
sys/dev/pci/pci_subr.c | 53 +-
sys/dev/pci/pcidevs | 76 +-
sys/dev/pci/pcidevs.h | 76 +-
sys/dev/pci/pcidevs_data.h | 18103 +-
sys/dev/pci/pcireg.h | 36 +-
sys/dev/pci/xhci_pci.c | 30 +-
sys/dev/ppbus/if_plip.c | 10 +-
sys/dev/raidframe/rf_netbsdkintf.c | 34 +-
sys/dev/sbus/mgx.c | 154 +-
sys/dev/scsipi/atapi_wdc.c | 17 +-
sys/dev/scsipi/cd.c | 14 +-
sys/dev/scsipi/scsiconf.c | 13 +-
sys/dev/scsipi/scsipiconf.c | 44 +-
sys/dev/scsipi/scsipiconf.h | 3 +-
sys/dev/splash/splash.c | 12 +-
sys/dev/sun/fbio.h | 5 +-
sys/dev/usb/ehci.c | 71 +-
sys/dev/usb/files.usb | 3 +-
sys/dev/usb/hid.c | 8 +-
sys/dev/usb/if_athn_usb.c | 8 +-
sys/dev/usb/if_atu.c | 8 +-
sys/dev/usb/if_otus.c | 8 +-
sys/dev/usb/if_rum.c | 8 +-
sys/dev/usb/if_run.c | 8 +-
sys/dev/usb/if_smsc.c | 4 +-
sys/dev/usb/if_upgt.c | 8 +-
sys/dev/usb/if_upl.c | 25 +-
sys/dev/usb/if_ural.c | 8 +-
sys/dev/usb/if_urtw.c | 8 +-
sys/dev/usb/if_urtwn.c | 8 +-
sys/dev/usb/if_zyd.c | 8 +-
sys/dev/usb/motg.c | 47 +-
sys/dev/usb/ohci.c | 55 +-
sys/dev/usb/ohcivar.h | 14 +-
sys/dev/usb/ucom.c | 52 +-
sys/dev/usb/uhci.c | 74 +-
sys/dev/usb/uhid.c | 15 +-
sys/dev/usb/uhidev.c | 11 +-
sys/dev/usb/uhso.c | 9 +-
sys/dev/usb/ukbd.c | 9 +-
sys/dev/usb/umass.c | 9 +-
sys/dev/usb/umass_scsipi.c | 13 +-
sys/dev/usb/umidi.c | 6 +-
sys/dev/usb/ums.c | 8 +-
sys/dev/usb/uplcom.c | 8 +-
sys/dev/usb/usb.c | 61 +-
sys/dev/usb/usb_mem.c | 8 +-
sys/dev/usb/usbdi.c | 10 +-
sys/dev/usb/uts.c | 8 +-
sys/dev/usb/xhci.c | 507 +-
sys/dev/usb/xhcireg.h | 5 +-
sys/dev/usb/xhcivar.h | 5 +-
sys/dist/pf/net/if_pflog.c | 8 +-
sys/dist/pf/net/if_pfsync.c | 8 +-
sys/dist/pf/net/pf_if.c | 35 +-
sys/external/bsd/acpica/conf/files.acpica | 4 +-
sys/external/bsd/acpica/dist/changes.txt | 233 +
sys/external/bsd/acpica/dist/common/acfileio.c | 11 +-
sys/external/bsd/acpica/dist/common/adwalk.c | 103 +-
sys/external/bsd/acpica/dist/common/ahids.c | 5 +
sys/external/bsd/acpica/dist/common/ahpredef.c | 5 +-
sys/external/bsd/acpica/dist/common/dmextern.c | 283 +-
sys/external/bsd/acpica/dist/common/dmrestag.c | 5 +-
sys/external/bsd/acpica/dist/common/dmtable.c | 64 +-
sys/external/bsd/acpica/dist/common/dmtables.c | 44 +-
sys/external/bsd/acpica/dist/common/dmtbdump.c | 23 +-
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 93 +-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 117 +
sys/external/bsd/acpica/dist/compiler/aslbtypes.c | 19 +-
sys/external/bsd/acpica/dist/compiler/aslcodegen.c | 75 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 79 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 97 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 8 +
sys/external/bsd/acpica/dist/compiler/asldebug.c | 253 +
sys/external/bsd/acpica/dist/compiler/asldefine.h | 35 +-
sys/external/bsd/acpica/dist/compiler/aslexternal.c | 498 +
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 18 +
sys/external/bsd/acpica/dist/compiler/aslfold.c | 15 +-
sys/external/bsd/acpica/dist/compiler/aslglobal.h | 13 +-
sys/external/bsd/acpica/dist/compiler/asllength.c | 9 +-
sys/external/bsd/acpica/dist/compiler/asllisting.c | 97 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 21 +-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 5 +-
sys/external/bsd/acpica/dist/compiler/aslmain.c | 39 +-
sys/external/bsd/acpica/dist/compiler/aslmap.c | 35 +-
sys/external/bsd/acpica/dist/compiler/aslmapoutput.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslmessages.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslmethod.c | 17 +-
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 705 +-
sys/external/bsd/acpica/dist/compiler/asloperands.c | 10 +-
sys/external/bsd/acpica/dist/compiler/aslopt.c | 44 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 14 +
sys/external/bsd/acpica/dist/compiler/aslparser.y | 4 +-
sys/external/bsd/acpica/dist/compiler/aslpld.c | 729 +
sys/external/bsd/acpica/dist/compiler/aslpredef.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 100 +-
sys/external/bsd/acpica/dist/compiler/aslprune.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslresource.c | 3 +
sys/external/bsd/acpica/dist/compiler/aslresources.y | 75 +-
sys/external/bsd/acpica/dist/compiler/aslrestype2e.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslrestype2s.c | 89 +-
sys/external/bsd/acpica/dist/compiler/aslrules.y | 46 +-
sys/external/bsd/acpica/dist/compiler/aslstubs.c | 14 +
sys/external/bsd/acpica/dist/compiler/asltokens.y | 6 +
sys/external/bsd/acpica/dist/compiler/asltransform.c | 49 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 29 +-
sys/external/bsd/acpica/dist/compiler/asltypes.h | 24 +-
sys/external/bsd/acpica/dist/compiler/asltypes.y | 7 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 349 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 20 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 9 +-
sys/external/bsd/acpica/dist/compiler/aslxrefout.c | 814 +
sys/external/bsd/acpica/dist/compiler/dtparser.y | 8 +-
sys/external/bsd/acpica/dist/compiler/dttable1.c | 17 +-
sys/external/bsd/acpica/dist/compiler/dttable2.c | 9 +-
sys/external/bsd/acpica/dist/compiler/dttemplate.h | 62 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 4 +-
sys/external/bsd/acpica/dist/compiler/prscan.c | 21 +-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbconvert.c | 8 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 3 +-
sys/external/bsd/acpica/dist/debugger/dbnames.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 8 +-
sys/external/bsd/acpica/dist/disassembler/dmbuffer.c | 82 +-
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 37 +-
sys/external/bsd/acpica/dist/disassembler/dmopcode.c | 28 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c | 24 +-
sys/external/bsd/acpica/dist/disassembler/dmutils.c | 10 +-
sys/external/bsd/acpica/dist/disassembler/dmwalk.c | 69 +-
sys/external/bsd/acpica/dist/dispatcher/dsmethod.c | 5 +-
sys/external/bsd/acpica/dist/dispatcher/dsobject.c | 2 +-
sys/external/bsd/acpica/dist/events/evgpeblk.c | 2 +-
sys/external/bsd/acpica/dist/events/evgpeinit.c | 2 +-
sys/external/bsd/acpica/dist/events/evregion.c | 83 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 1 -
sys/external/bsd/acpica/dist/executer/exconcat.c | 460 +
sys/external/bsd/acpica/dist/executer/exconfig.c | 9 +-
sys/external/bsd/acpica/dist/executer/exconvrt.c | 3 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 11 +-
sys/external/bsd/acpica/dist/executer/exfldio.c | 15 +-
sys/external/bsd/acpica/dist/executer/exmisc.c | 302 -
sys/external/bsd/acpica/dist/executer/exnames.c | 2 +-
sys/external/bsd/acpica/dist/executer/exoparg3.c | 4 +-
sys/external/bsd/acpica/dist/executer/exsystem.c | 2 +-
sys/external/bsd/acpica/dist/executer/exutils.c | 12 +-
sys/external/bsd/acpica/dist/generate/unix/Makefile.common | 4 +
sys/external/bsd/acpica/dist/generate/unix/Makefile.config | 12 +
sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile | 1 +
sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile | 5 +
sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile | 2 +
sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile | 6 +
sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile | 1 +
sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile | 1 +
sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile | 1 +
sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile | 20 +-
sys/external/bsd/acpica/dist/hardware/hwregs.c | 289 +-
sys/external/bsd/acpica/dist/hardware/hwxface.c | 3 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 4 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 3 +
sys/external/bsd/acpica/dist/include/acevents.h | 4 -
sys/external/bsd/acpica/dist/include/acglobal.h | 14 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 37 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 21 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 4 +-
sys/external/bsd/acpica/dist/include/acoutput.h | 4 +-
sys/external/bsd/acpica/dist/include/acparser.h | 2 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 10 +-
sys/external/bsd/acpica/dist/include/acpredef.h | 18 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 4 +-
sys/external/bsd/acpica/dist/include/acrestyp.h | 1 +
sys/external/bsd/acpica/dist/include/acstruct.h | 2 +-
sys/external/bsd/acpica/dist/include/actables.h | 4 -
sys/external/bsd/acpica/dist/include/actbl.h | 4 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 79 +-
sys/external/bsd/acpica/dist/include/actbl2.h | 42 +-
sys/external/bsd/acpica/dist/include/actbl3.h | 159 +-
sys/external/bsd/acpica/dist/include/actypes.h | 5 +-
sys/external/bsd/acpica/dist/include/acutils.h | 36 +-
sys/external/bsd/acpica/dist/include/platform/acenv.h | 44 +-
sys/external/bsd/acpica/dist/include/platform/acqnx.h | 74 +
sys/external/bsd/acpica/dist/namespace/nsconvert.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 7 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 213 +-
sys/external/bsd/acpica/dist/namespace/nsload.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsprepkg.c | 145 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 116 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/osbsdtbl.c | 4 +
sys/external/bsd/acpica/dist/os_specific/service_layers/osunixmap.c | 2 +-
sys/external/bsd/acpica/dist/parser/psargs.c | 8 +-
sys/external/bsd/acpica/dist/parser/psopinfo.c | 2 +-
sys/external/bsd/acpica/dist/parser/psutils.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 14 +-
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 15 +-
sys/external/bsd/acpica/dist/resources/rsserial.c | 18 +-
sys/external/bsd/acpica/dist/resources/rsutils.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 23 +-
sys/external/bsd/acpica/dist/tables/tbfind.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 6 +-
sys/external/bsd/acpica/dist/tables/tbprint.c | 6 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 35 +-
sys/external/bsd/acpica/dist/tables/tbxfload.c | 42 +-
sys/external/bsd/acpica/dist/tools/acpibin/abcompare.c | 2 +-
sys/external/bsd/acpica/dist/tools/acpidump/apdump.c | 12 +-
sys/external/bsd/acpica/dist/tools/acpidump/apmain.c | 3 +-
sys/external/bsd/acpica/dist/tools/acpiexec/aeinitfile.c | 3 +-
sys/external/bsd/acpica/dist/tools/acpiexec/aemain.c | 1 -
sys/external/bsd/acpica/dist/tools/acpihelp/ahamlops.c | 16 +-
sys/external/bsd/acpica/dist/tools/acpihelp/ahaslops.c | 22 +-
sys/external/bsd/acpica/dist/tools/acpisrc/asfile.c | 5 +-
sys/external/bsd/acpica/dist/tools/acpisrc/astable.c | 8 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 106 +-
sys/external/bsd/acpica/dist/tools/examples/examples.c | 16 +-
sys/external/bsd/acpica/dist/utilities/utascii.c | 161 +
sys/external/bsd/acpica/dist/utilities/utcache.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 38 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 29 +-
sys/external/bsd/acpica/dist/utilities/utfileio.c | 358 -
sys/external/bsd/acpica/dist/utilities/utglobal.c | 55 +
sys/external/bsd/acpica/dist/utilities/utnonansi.c | 640 +-
sys/external/bsd/acpica/dist/utilities/utprint.c | 6 -
sys/external/bsd/acpica/dist/utilities/utstring.c | 82 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utxferror.c | 2 -
sys/external/bsd/acpica/dist/utilities/utxfinit.c | 95 +-
sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c | 33 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c | 10 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c | 7 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c | 73 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nv40.c | 5 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c | 12 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c | 6 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c | 5 +-
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c | 15 +-
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c | 5 +-
sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c | 10 +
sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c | 83 +-
sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_driver.h | 29 +
sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h | 4 +-
sys/external/bsd/drm2/include/drm/ttm/ttm_page_alloc.h | 3 +-
sys/external/bsd/drm2/ttm/ttm_bus_dma.c | 110 +-
sys/external/bsd/dwc2/dwc2.c | 48 +-
sys/fs/msdosfs/msdosfs_fat.c | 36 +-
sys/fs/udf/udf.h | 8 +-
sys/fs/udf/udf_readwrite.c | 17 +-
sys/fs/udf/udf_strat_bootstrap.c | 13 +-
sys/fs/udf/udf_strat_direct.c | 14 +-
sys/fs/udf/udf_strat_rmw.c | 15 +-
sys/fs/udf/udf_strat_sequential.c | 42 +-
sys/fs/udf/udf_subr.c | 150 +-
sys/fs/udf/udf_subr.h | 5 +-
sys/gdbscripts/Makefile.inc | 4 +-
sys/gdbscripts/kernhist | 42 +
sys/kern/core_elf32.c | 59 +-
sys/kern/exec_elf.c | 38 +-
sys/kern/exec_subr.c | 36 +-
sys/kern/init_main.c | 8 +-
sys/kern/init_sysent.c | 12 +-
sys/kern/kern_exec.c | 23 +-
sys/kern/kern_exit.c | 20 +-
sys/kern/kern_pax.c | 193 +-
sys/kern/kern_proc.c | 6 +-
sys/kern/kern_rndq.c | 17 +-
sys/kern/kern_rndsink.c | 21 +-
sys/kern/kern_sig.c | 6 +-
sys/kern/kern_subr.c | 8 +-
sys/kern/kern_time.c | 35 +-
sys/kern/subr_copy.c | 8 +-
sys/kern/subr_tftproot.c | 14 +-
sys/kern/subr_time.c | 76 +-
sys/kern/sys_process.c | 8 +-
sys/kern/syscalls.c | 10 +-
sys/kern/syscalls.conf | 4 +-
sys/kern/syscalls.master | 4 +-
sys/kern/syscalls_autoload.c | 6 +-
sys/kern/systrace_args.c | 32 +-
sys/kern/uipc_mbuf.c | 24 +-
sys/kern/uipc_sem.c | 6 +-
sys/kern/uipc_socket2.c | 37 +-
sys/kern/vfs_mount.c | 16 +-
sys/kern/vfs_subr.c | 9 +-
sys/kern/vfs_vnode.c | 701 +-
sys/kern/vfs_wapbl.c | 421 +-
sys/lib/libkern/Makefile.libkern | 3 +-
sys/lib/libkern/libkern.h | 13 +-
sys/lib/libkern/strnvisx.c | 87 +
sys/modules/lua/lua.c | 8 +-
sys/net/if.c | 475 +-
sys/net/if.h | 99 +-
sys/net/if_arcsubr.c | 8 +-
sys/net/if_atm.h | 4 +-
sys/net/if_atmsubr.c | 6 +-
sys/net/if_bridge.c | 110 +-
sys/net/if_bridgevar.h | 4 +-
sys/net/if_ethersubr.c | 8 +-
sys/net/if_faith.c | 8 +-
sys/net/if_fddisubr.c | 8 +-
sys/net/if_gif.c | 6 +-
sys/net/if_gif.h | 4 +-
sys/net/if_gre.c | 8 +-
sys/net/if_hippisubr.c | 8 +-
sys/net/if_ieee1394subr.c | 25 +-
sys/net/if_loop.c | 11 +-
sys/net/if_mpls.c | 27 +-
sys/net/if_ppp.c | 6 +-
sys/net/if_pppoe.c | 13 +-
sys/net/if_pppvar.h | 4 +-
sys/net/if_sl.c | 8 +-
sys/net/if_spppsubr.c | 198 +-
sys/net/if_srt.c | 6 +-
sys/net/if_stf.c | 8 +-
sys/net/if_strip.c | 9 +-
sys/net/if_tokensubr.c | 8 +-
sys/net/if_tun.c | 8 +-
sys/net/if_vlan.c | 24 +-
sys/net/npf/npf_if.c | 8 +-
sys/net/route.c | 89 +-
sys/net/route.h | 22 +-
sys/net/rtsock.c | 215 +-
sys/net80211/ieee80211.h | 13 +-
sys/net80211/ieee80211_input.c | 38 +-
sys/net80211/ieee80211_netbsd.c | 8 +-
sys/net80211/ieee80211_output.c | 14 +-
sys/netinet/dccp_cc_sw.c | 5 +-
sys/netinet/dccp_tcplike.c | 5 +-
sys/netinet/dccp_tfrc.c | 5 +-
sys/netinet/if_arp.c | 10 +-
sys/netinet/if_atm.c | 16 +-
sys/netinet/if_atm.h | 4 +-
sys/netinet/igmp.c | 5 +-
sys/netinet/in.c | 6 +-
sys/netinet/in_offload.c | 6 +-
sys/netinet/in_pcb.h | 3 +-
sys/netinet/in_proto.c | 5 +-
sys/netinet/ip_carp.c | 21 +-
sys/netinet/ip_carp.h | 4 +-
sys/netinet/ip_encap.c | 5 +-
sys/netinet/ip_mroute.c | 5 +-
sys/netinet/ip_output.c | 139 +-
sys/netinet/ip_reass.c | 5 +-
sys/netinet/ip_var.h | 6 +-
sys/netinet/portalgo.c | 5 +-
sys/netinet/raw_ip.c | 9 +-
sys/netinet/sctp_asconf.c | 18 +-
sys/netinet/sctp_indata.c | 8 +-
sys/netinet/sctp_input.c | 13 +-
sys/netinet/sctp_output.c | 59 +-
sys/netinet/sctp_pcb.c | 19 +-
sys/netinet/sctp_peeloff.c | 8 +-
sys/netinet/sctp_structs.h | 6 +-
sys/netinet/sctp_timer.c | 8 +-
sys/netinet/sctp_usrreq.c | 19 +-
sys/netinet/sctputil.c | 18 +-
sys/netinet/sctputil.h | 5 +-
sys/netinet/tcp_congctl.c | 5 +-
sys/netinet/tcp_debug.c | 5 +-
sys/netinet/tcp_timer.c | 5 +-
sys/netinet/tcp_usrreq.c | 5 +-
sys/netinet/tcp_vtw.c | 3 +-
sys/netinet/tcp_vtw.h | 3 +-
sys/netinet/udp_usrreq.c | 5 +-
sys/netinet6/dccp6_usrreq.c | 5 +-
sys/netinet6/dest6.c | 5 +-
sys/netinet6/icmp6.c | 65 +-
sys/netinet6/in6.c | 9 +-
sys/netinet6/in6_ifattach.c | 21 +-
sys/netinet6/in6_proto.c | 5 +-
sys/netinet6/in6_src.c | 8 +-
sys/netinet6/ip6_input.c | 68 +-
sys/netinet6/nd6.c | 134 +-
sys/netinet6/nd6_nbr.c | 11 +-
sys/netinet6/nd6_rtr.c | 5 +-
sys/netinet6/raw_ip6.c | 9 +-
sys/netinet6/scope6.c | 12 +-
sys/netinet6/sctp6_usrreq.c | 17 +-
sys/netinet6/udp6_usrreq.c | 5 +-
sys/netipsec/ipsec_osdep.h | 15 +-
sys/netipsec/xform_ipip.c | 10 +-
sys/netisdn/i4b_ipr.c | 9 +-
sys/netmpls/mpls_ttl.c | 5 +-
sys/rump/dev/lib/libpci/Makefile | 31 +-
sys/rump/dev/lib/librnd/rnd_component.c | 31 +-
sys/rump/include/rump/rump_syscalls.h | 1216 +-
sys/rump/librump/rumpkern/hyperentropy.c | 19 +-
sys/rump/librump/rumpkern/lwproc.c | 31 +-
sys/rump/librump/rumpkern/rump_syscalls.c | 11 +-
sys/rump/librump/rumpkern/rumpcopy.c | 6 +-
sys/rump/librump/rumpnet/net_stub.c | 10 +-
sys/sys/Makefile | 6 +-
sys/sys/disk.h | 4 +-
sys/sys/exec_elf.h | 5 +-
sys/sys/mbuf.h | 3 +-
sys/sys/param.h | 4 +-
sys/sys/pax.h | 27 +-
sys/sys/proc.h | 3 +-
sys/sys/semaphore.h | 44 +
sys/sys/syscall.h | 9 +-
sys/sys/syscallargs.h | 18 +-
sys/sys/time.h | 4 +-
sys/sys/vnode.h | 30 +-
sys/ufs/ffs/ffs_subr.c | 8 +-
sys/ufs/ufs/ufs_bswap.h | 8 +-
sys/ufs/ufs/ufs_lookup.c | 227 +-
sys/ufs/ufs/ufs_vnops.c | 20 +-
sys/ufs/ufs/ufs_wapbl.h | 25 +-
sys/uvm/uvm_extern.h | 4 +-
sys/uvm/uvm_glue.c | 4 +-
sys/uvm/uvm_io.c | 10 +-
sys/uvm/uvm_map.c | 16 +-
sys/uvm/uvm_map.h | 3 +-
sys/uvm/uvm_mmap.c | 38 +-
629 files changed, 76984 insertions(+), 48787 deletions(-)
diffs (truncated from 153897 to 300 lines):
diff -r 4a8a7b797b18 -r e01b53085c5c sys/altq/altq_rio.c
--- a/sys/altq/altq_rio.c Sun May 29 08:18:45 2016 +0000
+++ b/sys/altq/altq_rio.c Sun May 29 08:44:15 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rio.c,v 1.21.40.1 2016/04/22 15:44:08 skrll Exp $ */
+/* $NetBSD: altq_rio.c,v 1.21.40.2 2016/05/29 08:44:15 skrll Exp $ */
/* $KAME: altq_rio.c,v 1.19 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.21.40.1 2016/04/22 15:44:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.21.40.2 2016/05/29 08:44:15 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -326,19 +326,6 @@
}
#endif
-#if 1
-/*
- * kludge: when a packet is dequeued, we need to know its drop precedence
- * in order to keep the queue length of each drop precedence.
- * use m_pkthdr.rcvif to pass this info.
- */
-#define RIOM_SET_PRECINDEX(m, idx) \
- do { (m)->m_pkthdr.rcvif = (struct ifnet *)((long)(idx)); } while (0)
-#define RIOM_GET_PRECINDEX(m) \
- ({ long idx; idx = (long)((m)->m_pkthdr.rcvif); \
- (m)->m_pkthdr.rcvif = NULL; idx; })
-#endif
-
int
rio_addq(rio_t *rp, class_queue_t *q, struct mbuf *m,
struct altq_pktattr *pktattr)
@@ -436,7 +423,7 @@
rp->rio_precstate[i].qlen++;
/* save drop precedence index in mbuf hdr */
- RIOM_SET_PRECINDEX(m, dpindex);
+ M_SETCTX(m, (intptr_t)dpindex);
if (rp->rio_flags & RIOF_CLEARDSCP)
dsfield &= ~DSCP_MASK;
@@ -461,7 +448,7 @@
if ((m = _getq(q)) == NULL)
return NULL;
- dpindex = RIOM_GET_PRECINDEX(m);
+ dpindex = M_GETCTX(m, intptr_t);
for (i = dpindex; i < RIO_NDROPPREC; i++) {
if (--rp->rio_precstate[i].qlen == 0) {
if (rp->rio_precstate[i].idle == 0) {
diff -r 4a8a7b797b18 -r e01b53085c5c sys/altq/altq_subr.c
--- a/sys/altq/altq_subr.c Sun May 29 08:18:45 2016 +0000
+++ b/sys/altq/altq_subr.c Sun May 29 08:44:15 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_subr.c,v 1.29.4.1 2016/04/22 15:44:08 skrll Exp $ */
+/* $NetBSD: altq_subr.c,v 1.29.4.2 2016/05/29 08:44:15 skrll Exp $ */
/* $KAME: altq_subr.c,v 1.24 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_subr.c,v 1.29.4.1 2016/04/22 15:44:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_subr.c,v 1.29.4.2 2016/05/29 08:44:15 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -355,15 +355,26 @@
int active, s;
active = 0;
- s = splnet();
- IFNET_FOREACH(ifp) {
+ s = pserialize_read_enter();
+ IFNET_READER_FOREACH(ifp) {
+ struct psref psref;
if (!TBR_IS_ENABLED(&ifp->if_snd))
continue;
+ psref_acquire(&psref, &ifp->if_psref, ifnet_psref_class);
+ pserialize_read_exit(s);
+
active++;
- if (!IFQ_IS_EMPTY(&ifp->if_snd) && ifp->if_start != NULL)
+ if (!IFQ_IS_EMPTY(&ifp->if_snd) && ifp->if_start != NULL) {
+ int _s = splnet();
(*ifp->if_start)(ifp);
+ splx(_s);
+ }
+
+ s = pserialize_read_enter();
+ psref_release(&psref, &ifp->if_psref, ifnet_psref_class);
}
- splx(s);
+ pserialize_read_exit(s);
+
if (active > 0)
CALLOUT_RESET(&tbr_callout, 1, tbr_timeout, (void *)0);
else
diff -r 4a8a7b797b18 -r e01b53085c5c sys/arch/aarch64/conf/Makefile.aarch64
--- a/sys/arch/aarch64/conf/Makefile.aarch64 Sun May 29 08:18:45 2016 +0000
+++ b/sys/arch/aarch64/conf/Makefile.aarch64 Sun May 29 08:44:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.4.2.1 2015/09/22 12:05:34 skrll Exp $
+# $NetBSD: Makefile.aarch64,v 1.4.2.2 2016/05/29 08:44:15 skrll Exp $
# Makefile for NetBSD
#
@@ -88,6 +88,16 @@
## (7) misc settings
##
+# define .MAIN _before_ the make() check, so that implicit target
+# would be defined
+.MAIN: all
+
+.if make(depend) || make(all) || make(dependall)
+.BEGIN:
+ @rm -f arm && \
+ ln -s $S/arch/arm/include arm
+.endif
+
##
## (8) config(8) generated machinery
##
diff -r 4a8a7b797b18 -r e01b53085c5c sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S Sun May 29 08:18:45 2016 +0000
+++ b/sys/arch/amd64/amd64/locore.S Sun May 29 08:44:15 2016 +0000
@@ -1,10 +1,39 @@
-/* $NetBSD: locore.S,v 1.77.2.2 2015/12/27 12:09:28 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.77.2.3 2016/05/29 08:44:15 skrll Exp $ */
/*
* Copyright-o-rama!
*/
/*
+ * Copyright (c) 1998, 2000, 2007, 2008, 2016 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum and Maxime Villard.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 2007 Manuel Bouyer.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,36 +109,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-
-/*-
- * Copyright (c) 1998, 2000, 2007, 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -144,9 +143,7 @@
* @(#)locore.s 7.3 (Berkeley) 5/13/91
*/
-/*
- * override user-land alignment before including asm.h
- */
+/* Override user-land alignment before including asm.h */
#define ALIGN_DATA .align 8
#define ALIGN_TEXT .align 16,0x90
#define _ALIGN_TEXT ALIGN_TEXT
@@ -184,13 +181,15 @@
#include <machine/i82489reg.h>
#endif
-/* XXX temporary kluge; these should not be here */
/* Get definitions for IOM_BEGIN, IOM_END, and IOM_SIZE */
#include <dev/isa/isareg.h>
#define _RELOC(x) ((x) - KERNBASE)
#define RELOC(x) _RELOC(_C_LABEL(x))
+/* 32bit version of PG_NX */
+#define PG_NX32 0x80000000
+
#if L2_SLOT_KERNBASE > 0
#define TABLE_L2_ENTRIES (2 * (NKL2_KIMG_ENTRIES + 1))
#else
@@ -204,12 +203,11 @@
#endif
#define PROC0_PML4_OFF 0
-#define PROC0_STK_OFF (PROC0_PML4_OFF + PAGE_SIZE)
-#define PROC0_PTP3_OFF (PROC0_STK_OFF + UPAGES * PAGE_SIZE)
+#define PROC0_PTP3_OFF (PROC0_PML4_OFF + 1 * PAGE_SIZE)
#define PROC0_PTP2_OFF (PROC0_PTP3_OFF + NKL4_KIMG_ENTRIES * PAGE_SIZE)
#define PROC0_PTP1_OFF (PROC0_PTP2_OFF + TABLE_L3_ENTRIES * PAGE_SIZE)
#define TABLESIZE \
- ((NKL4_KIMG_ENTRIES + TABLE_L3_ENTRIES + TABLE_L2_ENTRIES + 1 + UPAGES) \
+ ((NKL4_KIMG_ENTRIES + TABLE_L3_ENTRIES + TABLE_L2_ENTRIES + 1) \
* PAGE_SIZE)
/*
@@ -221,21 +219,61 @@
* Each entry is 8 (PDE_SIZE) bytes long: we must set the 4 upper bytes to 0.
*/
#define fillkpt \
-1: movl %eax,(%ebx) ; /* store phys addr */ \
- movl $0,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits 0 */ \
- addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \
- addl $PAGE_SIZE,%eax ; /* next phys page */ \
- loop 1b ;
+ cmpl $0,%ecx ; /* zero-sized? */ \
+ je 2f ; \
+1: movl $0,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: 0 */ \
+ movl %eax,(%ebx) ; /* store phys addr */ \
+ addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \
+ addl $PAGE_SIZE,%eax ; /* next phys page */ \
+ loop 1b ; \
+2: ;
+
+/*
+ * fillkpt_nox - Same as fillkpt, but sets the NX/XD bit.
+ */
+#define fillkpt_nox \
+ cmpl $0,%ecx ; /* zero-sized? */ \
+ je 2f ; \
+ pushl %ebp ; \
+ movl RELOC(nox_flag),%ebp ; \
+1: movl %ebp,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: NX */ \
+ movl %eax,(%ebx) ; /* store phys addr */ \
+ addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \
+ addl $PAGE_SIZE,%eax ; /* next phys page */ \
+ loop 1b ; \
+ popl %ebp ; \
+2: ;
+
+/*
+ * fillkpt_blank - Fill in a kernel page table with blank entries
+ * ebx = page table address
+ * ecx = number of pages to map
+ */
+#define fillkpt_blank \
+ cmpl $0,%ecx ; /* zero-sized? */ \
+ je 2f ; \
+1: movl $0,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: 0 */ \
+ movl $0,(%ebx) ; /* lower 32 bits: 0 */ \
+ addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \