Date: Sun, 8 Dec 2019 22:36:38 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r355539 - in projects/nfsv42/sys: amd64/amd64 amd64/cloudabi32 amd64/cloudabi64 amd64/ia32 amd64/include amd64/linux amd64/linux32 amd64/sgx arm/allwinner arm/allwinner/a10 arm/allwinne... Message-ID: <201912082236.xB8MacgZ089868@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sun Dec 8 22:36:37 2019 New Revision: 355539 URL: https://svnweb.freebsd.org/changeset/base/355539 Log: Merge in an up to date kernel from head. Added: projects/nfsv42/sys/arm/mv/a37x0_iic.c - copied unchanged from r355537, head/sys/arm/mv/a37x0_iic.c projects/nfsv42/sys/arm/mv/a37x0_iicreg.h - copied unchanged from r355537, head/sys/arm/mv/a37x0_iicreg.h projects/nfsv42/sys/arm/mv/a37x0_spi.c - copied unchanged from r355537, head/sys/arm/mv/a37x0_spi.c projects/nfsv42/sys/dev/gpio/gpiomdio.c - copied unchanged from r355537, head/sys/dev/gpio/gpiomdio.c projects/nfsv42/sys/dev/mlx5/mlx5_core/mlx5_tls.c - copied unchanged from r355537, head/sys/dev/mlx5/mlx5_core/mlx5_tls.c projects/nfsv42/sys/dev/mlx5/mlx5_en/en_hw_tls.h - copied unchanged from r355537, head/sys/dev/mlx5/mlx5_en/en_hw_tls.h projects/nfsv42/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c - copied unchanged from r355537, head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c projects/nfsv42/sys/dev/mlx5/tls.h - copied unchanged from r355537, head/sys/dev/mlx5/tls.h projects/nfsv42/sys/gnu/dts/riscv/ - copied from r355537, head/sys/gnu/dts/riscv/ projects/nfsv42/sys/modules/gpio/gpioths/ - copied from r355537, head/sys/modules/gpio/gpioths/ projects/nfsv42/sys/netinet/tcp_stats.c - copied unchanged from r355537, head/sys/netinet/tcp_stats.c Replaced: projects/nfsv42/sys/arm64/arm64/machdep_boot.c - copied unchanged from r355537, head/sys/arm64/arm64/machdep_boot.c Modified: projects/nfsv42/sys/amd64/amd64/machdep.c projects/nfsv42/sys/amd64/amd64/pmap.c projects/nfsv42/sys/amd64/cloudabi32/cloudabi32_sysvec.c projects/nfsv42/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/nfsv42/sys/amd64/ia32/ia32_signal.c projects/nfsv42/sys/amd64/include/_bus.h projects/nfsv42/sys/amd64/linux/Makefile projects/nfsv42/sys/amd64/linux/linux_sysvec.c projects/nfsv42/sys/amd64/linux32/Makefile projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c projects/nfsv42/sys/amd64/sgx/sgx.c projects/nfsv42/sys/arm/allwinner/a10/a10_padconf.c projects/nfsv42/sys/arm/allwinner/a10_ahci.c projects/nfsv42/sys/arm/allwinner/a10_fb.c projects/nfsv42/sys/arm/allwinner/a10_hdmi.c projects/nfsv42/sys/arm/allwinner/a10_hdmiaudio.c projects/nfsv42/sys/arm/allwinner/a13/a13_padconf.c projects/nfsv42/sys/arm/allwinner/a20/a20_padconf.c projects/nfsv42/sys/arm/allwinner/a31/a31_padconf.c projects/nfsv42/sys/arm/allwinner/a31/a31_r_padconf.c projects/nfsv42/sys/arm/allwinner/a31/a31s_padconf.c projects/nfsv42/sys/arm/allwinner/a33/a33_padconf.c projects/nfsv42/sys/arm/allwinner/a64/a64_padconf.c projects/nfsv42/sys/arm/allwinner/a64/a64_r_padconf.c projects/nfsv42/sys/arm/allwinner/a83t/a83t_padconf.c projects/nfsv42/sys/arm/allwinner/a83t/a83t_r_padconf.c projects/nfsv42/sys/arm/allwinner/allwinner_pinctrl.h projects/nfsv42/sys/arm/allwinner/aw_ccu.c projects/nfsv42/sys/arm/allwinner/aw_gmacclk.c projects/nfsv42/sys/arm/allwinner/aw_machdep.h projects/nfsv42/sys/arm/allwinner/aw_mp.h projects/nfsv42/sys/arm/allwinner/aw_nmi.c projects/nfsv42/sys/arm/allwinner/aw_reset.c projects/nfsv42/sys/arm/allwinner/aw_rsb.c projects/nfsv42/sys/arm/allwinner/aw_sid.c projects/nfsv42/sys/arm/allwinner/aw_sid.h projects/nfsv42/sys/arm/allwinner/aw_thermal.c projects/nfsv42/sys/arm/allwinner/aw_ts.c projects/nfsv42/sys/arm/allwinner/aw_usbphy.c projects/nfsv42/sys/arm/allwinner/axp209.c projects/nfsv42/sys/arm/allwinner/axp209reg.h projects/nfsv42/sys/arm/allwinner/axp81x.c projects/nfsv42/sys/arm/allwinner/clkng/aw_clk.h projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nkmp.c projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.c projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.h projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.h projects/nfsv42/sys/arm/allwinner/h3/h3_padconf.c projects/nfsv42/sys/arm/allwinner/h3/h3_r_padconf.c projects/nfsv42/sys/arm/allwinner/if_awg.c projects/nfsv42/sys/arm/allwinner/if_awgreg.h projects/nfsv42/sys/arm/arm/machdep.c projects/nfsv42/sys/arm/arm/mp_machdep.c projects/nfsv42/sys/arm/arm/unwind.c projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2836_mp.h projects/nfsv42/sys/arm/cloudabi32/cloudabi32_sysvec.c projects/nfsv42/sys/arm/conf/genboardid.awk projects/nfsv42/sys/arm/include/_bus.h projects/nfsv42/sys/arm/include/atags.h projects/nfsv42/sys/arm/include/board.h projects/nfsv42/sys/arm/include/machdep.h projects/nfsv42/sys/arm/nvidia/drm2/tegra_bo.c projects/nfsv42/sys/arm/xilinx/uart_dev_cdnc.c projects/nfsv42/sys/arm64/arm64/elf32_machdep.c projects/nfsv42/sys/arm64/arm64/locore.S projects/nfsv42/sys/arm64/arm64/machdep.c projects/nfsv42/sys/arm64/arm64/pmap.c projects/nfsv42/sys/arm64/cloudabi32/cloudabi32_sysvec.c projects/nfsv42/sys/arm64/cloudabi64/cloudabi64_sysvec.c projects/nfsv42/sys/arm64/conf/GENERIC projects/nfsv42/sys/arm64/include/_bus.h projects/nfsv42/sys/arm64/include/machdep.h projects/nfsv42/sys/arm64/linux/Makefile projects/nfsv42/sys/arm64/linux/linux_sysvec.c projects/nfsv42/sys/arm64/rockchip/clk/rk3328_cru.c projects/nfsv42/sys/arm64/rockchip/clk/rk3399_cru.c projects/nfsv42/sys/arm64/rockchip/clk/rk_clk_armclk.c projects/nfsv42/sys/arm64/rockchip/clk/rk_clk_armclk.h projects/nfsv42/sys/arm64/rockchip/clk/rk_clk_composite.c projects/nfsv42/sys/arm64/rockchip/clk/rk_clk_composite.h projects/nfsv42/sys/arm64/rockchip/clk/rk_clk_gate.h projects/nfsv42/sys/arm64/rockchip/clk/rk_clk_pll.c projects/nfsv42/sys/arm64/rockchip/clk/rk_clk_pll.h projects/nfsv42/sys/arm64/rockchip/clk/rk_cru.c projects/nfsv42/sys/arm64/rockchip/clk/rk_cru.h projects/nfsv42/sys/arm64/rockchip/if_dwc_rk.c projects/nfsv42/sys/arm64/rockchip/rk805.c projects/nfsv42/sys/arm64/rockchip/rk805reg.h projects/nfsv42/sys/arm64/rockchip/rk_gpio.c projects/nfsv42/sys/arm64/rockchip/rk_grf.c projects/nfsv42/sys/arm64/rockchip/rk_pinctrl.c projects/nfsv42/sys/cam/cam_xpt.c projects/nfsv42/sys/cam/ctl/ctl_backend_block.c projects/nfsv42/sys/cam/mmc/mmc_da.c projects/nfsv42/sys/cam/scsi/scsi_cd.c projects/nfsv42/sys/cam/scsi/scsi_enc_ses.c projects/nfsv42/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/nfsv42/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/nfsv42/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/nfsv42/sys/compat/cloudabi/cloudabi_vdso.c projects/nfsv42/sys/compat/cloudabi32/Makefile projects/nfsv42/sys/compat/cloudabi32/cloudabi32_module.c projects/nfsv42/sys/compat/cloudabi32/cloudabi32_util.h projects/nfsv42/sys/compat/cloudabi64/Makefile projects/nfsv42/sys/compat/cloudabi64/cloudabi64_module.c projects/nfsv42/sys/compat/cloudabi64/cloudabi64_util.h projects/nfsv42/sys/compat/freebsd32/Makefile projects/nfsv42/sys/compat/freebsd32/freebsd32_misc.c projects/nfsv42/sys/compat/freebsd32/freebsd32_util.h projects/nfsv42/sys/compat/ia32/ia32_signal.h projects/nfsv42/sys/compat/linux/linux_vdso.c projects/nfsv42/sys/conf/Makefile.arm64 projects/nfsv42/sys/conf/files projects/nfsv42/sys/conf/files.arm64 projects/nfsv42/sys/conf/files.powerpc projects/nfsv42/sys/conf/kern.mk projects/nfsv42/sys/conf/options.arm64 projects/nfsv42/sys/dev/aacraid/aacraid.c projects/nfsv42/sys/dev/aacraid/aacraid_cam.c projects/nfsv42/sys/dev/aacraid/aacraid_linux.c projects/nfsv42/sys/dev/aacraid/aacraid_var.h projects/nfsv42/sys/dev/ahci/ahci.c projects/nfsv42/sys/dev/ata/ata-all.c projects/nfsv42/sys/dev/ata/ata-all.h projects/nfsv42/sys/dev/ata/ata-lowlevel.c projects/nfsv42/sys/dev/beri/virtio/virtio_block.c projects/nfsv42/sys/dev/cardbus/cardbus.c projects/nfsv42/sys/dev/cardbus/cardbus_cis.c projects/nfsv42/sys/dev/cardbus/cardbus_device.c projects/nfsv42/sys/dev/cardbus/cardbusvar.h projects/nfsv42/sys/dev/cpufreq/cpufreq_dt.c projects/nfsv42/sys/dev/ctau/ctau.c projects/nfsv42/sys/dev/exca/exca.c projects/nfsv42/sys/dev/exca/excareg.h projects/nfsv42/sys/dev/exca/excavar.h projects/nfsv42/sys/dev/fdc/fdc_isa.c projects/nfsv42/sys/dev/fdc/fdc_pccard.c projects/nfsv42/sys/dev/fdc/fdcvar.h projects/nfsv42/sys/dev/flash/at45d.c projects/nfsv42/sys/dev/flash/mx25l.c projects/nfsv42/sys/dev/flash/n25q.c projects/nfsv42/sys/dev/gpio/gpiobus.c projects/nfsv42/sys/dev/gpio/gpioiic.c projects/nfsv42/sys/dev/gpio/gpioregulator.c projects/nfsv42/sys/dev/gpio/gpioths.c projects/nfsv42/sys/dev/hdmi/dwc_hdmi.h projects/nfsv42/sys/dev/iicbus/icee.c projects/nfsv42/sys/dev/iicbus/sy8106a.c projects/nfsv42/sys/dev/md/md.c projects/nfsv42/sys/dev/mii/axphy.c projects/nfsv42/sys/dev/mlx5/device.h projects/nfsv42/sys/dev/mlx5/driver.h projects/nfsv42/sys/dev/mlx5/mlx5_core/mlx5_cmd.c projects/nfsv42/sys/dev/mlx5/mlx5_core/mlx5_fw.c projects/nfsv42/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c projects/nfsv42/sys/dev/mlx5/mlx5_core/mlx5_main.c projects/nfsv42/sys/dev/mlx5/mlx5_en/en.h projects/nfsv42/sys/dev/mlx5/mlx5_en/en_rl.h projects/nfsv42/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c projects/nfsv42/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/nfsv42/sys/dev/mlx5/mlx5_en/mlx5_en_rl.c projects/nfsv42/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c projects/nfsv42/sys/dev/mlx5/mlx5_ifc.h projects/nfsv42/sys/dev/mlx5/qp.h projects/nfsv42/sys/dev/mmc/bridge.h projects/nfsv42/sys/dev/mmc/host/dwmmc_altera.c projects/nfsv42/sys/dev/mmc/host/dwmmc_rockchip.c projects/nfsv42/sys/dev/mmc/host/dwmmc_samsung.c projects/nfsv42/sys/dev/mmc/mmc.c projects/nfsv42/sys/dev/mmc/mmc_private.h projects/nfsv42/sys/dev/mmc/mmc_subr.c projects/nfsv42/sys/dev/mmc/mmc_subr.h projects/nfsv42/sys/dev/mmc/mmcbr_if.m projects/nfsv42/sys/dev/mmc/mmcbrvar.h projects/nfsv42/sys/dev/mmc/mmcbus_if.m projects/nfsv42/sys/dev/mmc/mmcreg.h projects/nfsv42/sys/dev/mmc/mmcsd.c projects/nfsv42/sys/dev/mmc/mmcvar.h projects/nfsv42/sys/dev/mvs/mvs.c projects/nfsv42/sys/dev/nvme/nvme_qpair.c projects/nfsv42/sys/dev/ow/ow.c projects/nfsv42/sys/dev/ow/ow.h projects/nfsv42/sys/dev/ow/ow_temp.c projects/nfsv42/sys/dev/ow/owc_gpiobus.c projects/nfsv42/sys/dev/ow/owll.h projects/nfsv42/sys/dev/ow/owll_if.m projects/nfsv42/sys/dev/ow/own.h projects/nfsv42/sys/dev/ow/own_if.m projects/nfsv42/sys/dev/pccard/card_if.m projects/nfsv42/sys/dev/pccard/pccard_device.c projects/nfsv42/sys/dev/pccard/pccardvarp.h projects/nfsv42/sys/dev/pccard/power_if.m projects/nfsv42/sys/dev/pccbb/pccbb.c projects/nfsv42/sys/dev/pccbb/pccbb_isa.c projects/nfsv42/sys/dev/pccbb/pccbb_pci.c projects/nfsv42/sys/dev/pccbb/pccbbdevid.h projects/nfsv42/sys/dev/pccbb/pccbbvar.h projects/nfsv42/sys/dev/pci/hostb_pci.c projects/nfsv42/sys/dev/pci/pci_user.c projects/nfsv42/sys/dev/pci/pcireg.h projects/nfsv42/sys/dev/pci/pcivar.h projects/nfsv42/sys/dev/puc/puc_pci.c projects/nfsv42/sys/dev/pwm/ofw_pwm.c projects/nfsv42/sys/dev/pwm/ofw_pwm.h projects/nfsv42/sys/dev/pwm/pwmbus.c projects/nfsv42/sys/dev/pwm/pwmc.c projects/nfsv42/sys/dev/pwm/pwmc.h projects/nfsv42/sys/dev/sdhci/sdhci_if.m projects/nfsv42/sys/dev/siis/siis.c projects/nfsv42/sys/dev/sound/pci/hda/hdac.c projects/nfsv42/sys/dev/sound/pci/hda/hdac.h projects/nfsv42/sys/dev/sound/pci/hda/hdacc.c projects/nfsv42/sys/dev/spibus/spi.h projects/nfsv42/sys/dev/spibus/spibus.c projects/nfsv42/sys/dev/spibus/spibus_if.m projects/nfsv42/sys/dev/spibus/spibusvar.h projects/nfsv42/sys/dev/syscons/scterm-sc.c (contents, props changed) projects/nfsv42/sys/dev/syscons/syscons.c projects/nfsv42/sys/dev/uart/uart_bus_acpi.c projects/nfsv42/sys/dev/uart/uart_bus_isa.c projects/nfsv42/sys/dev/uart/uart_bus_pccard.c projects/nfsv42/sys/dev/uart/uart_bus_pci.c projects/nfsv42/sys/dev/uart/uart_bus_puc.c projects/nfsv42/sys/dev/uart/uart_dev_snps.c projects/nfsv42/sys/dev/usb/controller/generic_ohci.c projects/nfsv42/sys/dev/usb/controller/generic_usb_if.m projects/nfsv42/sys/dev/usb/misc/ufm.c projects/nfsv42/sys/dev/usb/serial/ufoma.c projects/nfsv42/sys/dev/usb/serial/umodem.c projects/nfsv42/sys/dev/usb/ufm_ioctl.h projects/nfsv42/sys/dev/wi/if_wivar.h projects/nfsv42/sys/dev/xen/blkback/blkback.c projects/nfsv42/sys/fs/autofs/autofs_vnops.c projects/nfsv42/sys/fs/cd9660/cd9660_vnops.c projects/nfsv42/sys/fs/devfs/devfs_vnops.c projects/nfsv42/sys/fs/ext2fs/ext2_lookup.c projects/nfsv42/sys/fs/fdescfs/fdesc_vnops.c projects/nfsv42/sys/fs/fuse/fuse_io.c projects/nfsv42/sys/fs/nfsclient/nfs_clport.c projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c projects/nfsv42/sys/fs/nfsserver/nfs_nfsdport.c projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c projects/nfsv42/sys/fs/nfsserver/nfs_nfsdstate.c projects/nfsv42/sys/fs/nullfs/null_subr.c projects/nfsv42/sys/fs/nullfs/null_vfsops.c projects/nfsv42/sys/fs/nullfs/null_vnops.c projects/nfsv42/sys/fs/pseudofs/pseudofs_vnops.c projects/nfsv42/sys/fs/smbfs/smbfs_io.c projects/nfsv42/sys/fs/smbfs/smbfs_vnops.c projects/nfsv42/sys/fs/tmpfs/tmpfs.h projects/nfsv42/sys/fs/tmpfs/tmpfs_subr.c projects/nfsv42/sys/fs/tmpfs/tmpfs_vfsops.c projects/nfsv42/sys/fs/tmpfs/tmpfs_vnops.c projects/nfsv42/sys/fs/unionfs/union_subr.c projects/nfsv42/sys/geom/geom.h projects/nfsv42/sys/geom/geom_dev.c projects/nfsv42/sys/geom/geom_disk.c projects/nfsv42/sys/geom/geom_dump.c projects/nfsv42/sys/geom/geom_int.h projects/nfsv42/sys/geom/geom_io.c projects/nfsv42/sys/geom/geom_kern.c projects/nfsv42/sys/geom/geom_subr.c projects/nfsv42/sys/geom/mirror/g_mirror_ctl.c projects/nfsv42/sys/geom/multipath/g_multipath.c projects/nfsv42/sys/geom/part/g_part.c projects/nfsv42/sys/geom/part/g_part_mbr.c projects/nfsv42/sys/geom/part/g_part_vtoc8.c projects/nfsv42/sys/i386/cloudabi32/cloudabi32_sysvec.c projects/nfsv42/sys/i386/i386/machdep.c projects/nfsv42/sys/i386/include/_bus.h projects/nfsv42/sys/i386/linux/Makefile projects/nfsv42/sys/i386/linux/linux_sysvec.c projects/nfsv42/sys/kern/Makefile projects/nfsv42/sys/kern/imgact_aout.c projects/nfsv42/sys/kern/imgact_elf.c projects/nfsv42/sys/kern/kern_clock.c projects/nfsv42/sys/kern/kern_exec.c projects/nfsv42/sys/kern/kern_lockf.c projects/nfsv42/sys/kern/kern_mbuf.c projects/nfsv42/sys/kern/kern_mtxpool.c projects/nfsv42/sys/kern/kern_sharedpage.c projects/nfsv42/sys/kern/kern_shutdown.c projects/nfsv42/sys/kern/kern_sig.c projects/nfsv42/sys/kern/kern_sx.c projects/nfsv42/sys/kern/kern_timeout.c projects/nfsv42/sys/kern/sched_4bsd.c projects/nfsv42/sys/kern/sched_ule.c projects/nfsv42/sys/kern/subr_devstat.c projects/nfsv42/sys/kern/subr_epoch.c projects/nfsv42/sys/kern/subr_vmem.c projects/nfsv42/sys/kern/tty.c projects/nfsv42/sys/kern/vfs_bio.c projects/nfsv42/sys/kern/vfs_cache.c projects/nfsv42/sys/kern/vfs_cluster.c projects/nfsv42/sys/kern/vfs_default.c projects/nfsv42/sys/kern/vfs_lookup.c projects/nfsv42/sys/kern/vfs_subr.c projects/nfsv42/sys/kern/vfs_syscalls.c projects/nfsv42/sys/kern/vfs_vnops.c projects/nfsv42/sys/mips/cavium/uart_cpu_octeonusart.c projects/nfsv42/sys/mips/include/_bus.h projects/nfsv42/sys/mips/include/elf.h projects/nfsv42/sys/mips/ingenic/jz4780_lcd.c projects/nfsv42/sys/mips/ingenic/jz4780_lcd.h projects/nfsv42/sys/mips/ingenic/jz4780_smb.c projects/nfsv42/sys/mips/ingenic/jz4780_smb.h projects/nfsv42/sys/mips/mips/busdma_machdep.c projects/nfsv42/sys/mips/mips/freebsd32_machdep.c projects/nfsv42/sys/mips/mips/pm_machdep.c projects/nfsv42/sys/mips/mips/ptrace_machdep.c projects/nfsv42/sys/modules/gpio/Makefile projects/nfsv42/sys/modules/mlx5/Makefile projects/nfsv42/sys/modules/mlx5en/Makefile projects/nfsv42/sys/net/altq/altq_rmclass.c projects/nfsv42/sys/netinet/cc/cc.h projects/nfsv42/sys/netinet/icmp6.h projects/nfsv42/sys/netinet/in_mcast.c projects/nfsv42/sys/netinet/ip_carp.c projects/nfsv42/sys/netinet/ip_carp.h projects/nfsv42/sys/netinet/tcp.h projects/nfsv42/sys/netinet/tcp_input.c projects/nfsv42/sys/netinet/tcp_log_buf.c projects/nfsv42/sys/netinet/tcp_output.c projects/nfsv42/sys/netinet/tcp_subr.c projects/nfsv42/sys/netinet/tcp_usrreq.c projects/nfsv42/sys/netinet/tcp_var.h projects/nfsv42/sys/netinet6/icmp6.c projects/nfsv42/sys/netinet6/in6_mcast.c projects/nfsv42/sys/netinet6/ip6_input.c projects/nfsv42/sys/netinet6/udp6_usrreq.c projects/nfsv42/sys/powerpc/aim/mmu_oea64.c projects/nfsv42/sys/powerpc/aim/mmu_oea64.h projects/nfsv42/sys/powerpc/aim/moea64_native.c projects/nfsv42/sys/powerpc/aim/slb.c projects/nfsv42/sys/powerpc/booke/locore.S projects/nfsv42/sys/powerpc/booke/pmap.c projects/nfsv42/sys/powerpc/include/_bus.h projects/nfsv42/sys/powerpc/include/cpufunc.h projects/nfsv42/sys/powerpc/include/pmap.h projects/nfsv42/sys/powerpc/include/reg.h projects/nfsv42/sys/powerpc/include/vmparam.h projects/nfsv42/sys/powerpc/mpc85xx/fsl_sata.c projects/nfsv42/sys/powerpc/powerpc/elf64_machdep.c projects/nfsv42/sys/powerpc/powerpc/exec_machdep.c projects/nfsv42/sys/powerpc/powerpc/mmu_if.m projects/nfsv42/sys/powerpc/powerpc/pmap_dispatch.c projects/nfsv42/sys/riscv/include/_bus.h projects/nfsv42/sys/riscv/riscv/machdep.c projects/nfsv42/sys/sparc64/include/_bus.h projects/nfsv42/sys/sparc64/sparc64/db_trace.c projects/nfsv42/sys/sparc64/sparc64/machdep.c projects/nfsv42/sys/sys/bitset.h projects/nfsv42/sys/sys/bitstring.h projects/nfsv42/sys/sys/buf.h projects/nfsv42/sys/sys/exec.h projects/nfsv42/sys/sys/imgact.h projects/nfsv42/sys/sys/imgact_elf.h projects/nfsv42/sys/sys/param.h projects/nfsv42/sys/sys/sched.h projects/nfsv42/sys/sys/stats.h projects/nfsv42/sys/sys/sysent.h projects/nfsv42/sys/sys/vnode.h projects/nfsv42/sys/tools/makesyscalls.lua projects/nfsv42/sys/ufs/ffs/ffs_alloc.c projects/nfsv42/sys/ufs/ffs/ffs_inode.c projects/nfsv42/sys/ufs/ffs/ffs_rawread.c projects/nfsv42/sys/ufs/ffs/ffs_softdep.c projects/nfsv42/sys/ufs/ffs/ffs_vnops.c projects/nfsv42/sys/ufs/ufs/ufs_inode.c projects/nfsv42/sys/ufs/ufs/ufs_lookup.c projects/nfsv42/sys/vm/swap_pager.c projects/nfsv42/sys/vm/uma_core.c projects/nfsv42/sys/vm/uma_int.h projects/nfsv42/sys/vm/vm_glue.c projects/nfsv42/sys/vm/vm_map.c projects/nfsv42/sys/vm/vm_map.h projects/nfsv42/sys/vm/vm_object.c projects/nfsv42/sys/vm/vm_page.c projects/nfsv42/sys/vm/vm_page.h projects/nfsv42/sys/vm/vnode_pager.c projects/nfsv42/sys/x86/iommu/intel_utils.c projects/nfsv42/sys/x86/x86/cpu_machdep.c projects/nfsv42/sys/x86/x86/mp_x86.c Directory Properties: projects/nfsv42/sys/ (props changed) projects/nfsv42/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/nfsv42/sys/amd64/amd64/machdep.c ============================================================================== --- projects/nfsv42/sys/amd64/amd64/machdep.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/amd64/machdep.c Sun Dec 8 22:36:37 2019 (r355539) @@ -577,7 +577,7 @@ freebsd4_sigreturn(struct thread *td, struct freebsd4_ * Reset registers to default values on exec. */ void -exec_setregs(struct thread *td, struct image_params *imgp, u_long stack) +exec_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack) { struct trapframe *regs; struct pcb *pcb; @@ -1778,10 +1778,17 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) vty_set_preferred(VTY_VT); TUNABLE_INT_FETCH("hw.ibrs_disable", &hw_ibrs_disable); + TUNABLE_INT_FETCH("machdep.mitigations.ibrs.disable", &hw_ibrs_disable); + TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); + TUNABLE_INT_FETCH("machdep.mitigations.ssb.disable", &hw_ssb_disable); + TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush", &syscall_ret_l1d_flush_mode); + TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable); + TUNABLE_INT_FETCH("machdep.mitigations.mds.disable", &hw_mds_disable); + TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable); finishidentcpu(); /* Final stage of CPU initialization */ Modified: projects/nfsv42/sys/amd64/amd64/pmap.c ============================================================================== --- projects/nfsv42/sys/amd64/amd64/pmap.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/amd64/pmap.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1771,6 +1771,8 @@ pmap_bootstrap(vm_paddr_t *firstaddr) pcpu_init(&__pcpu[0], 0, sizeof(struct pcpu)); amd64_bsp_pcpu_init1(&__pcpu[0]); amd64_bsp_ist_init(&__pcpu[0]); + __pcpu[0].pc_common_tss.tss_iobase = sizeof(struct amd64tss) + + IOPERM_BITMAP_SIZE; memcpy(__pcpu[0].pc_gdt, temp_bsp_pcpu.pc_gdt, NGDT * sizeof(struct user_segment_descriptor)); gdt_segs[GPROC0_SEL].ssd_base = (uintptr_t)&__pcpu[0].pc_common_tss; Modified: projects/nfsv42/sys/amd64/cloudabi32/cloudabi32_sysvec.c ============================================================================== --- projects/nfsv42/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Dec 8 22:36:37 2019 (r355539) @@ -53,7 +53,7 @@ extern struct sysent cloudabi32_sysent[]; extern unsigned long ia32_maxssiz; static int -cloudabi32_fixup_tcb(register_t **stack_base, struct image_params *imgp) +cloudabi32_fixup_tcb(uintptr_t *stack_base, struct image_params *imgp) { int error; uint32_t args[2]; @@ -73,16 +73,16 @@ cloudabi32_fixup_tcb(register_t **stack_base, struct i * refer to the auxiliary vector, which is stored right after * the TCB. */ - args[0] = (uintptr_t)*stack_base; - args[1] = (uintptr_t)*stack_base + + args[0] = *stack_base; + args[1] = *stack_base + roundup(sizeof(cloudabi32_tcb_t), sizeof(register_t)); - *stack_base -= howmany(sizeof(args), sizeof(register_t)); - return (copyout(args, *stack_base, sizeof(args))); + *stack_base -= roundup2(sizeof(args), sizeof(register_t)); + return (copyout(args, (void *)*stack_base, sizeof(args))); } static void cloudabi32_proc_setregs(struct thread *td, struct image_params *imgp, - unsigned long stack) + uintptr_t stack) { ia32_setregs(td, imgp, stack); Modified: projects/nfsv42/sys/amd64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- projects/nfsv42/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Dec 8 22:36:37 2019 (r355539) @@ -48,7 +48,7 @@ extern const char *cloudabi64_syscallnames[]; extern struct sysent cloudabi64_sysent[]; static int -cloudabi64_fixup_tcb(register_t **stack_base, struct image_params *imgp) +cloudabi64_fixup_tcb(uintptr_t *stack_base, struct image_params *imgp) { int error; register_t tcbptr; @@ -64,12 +64,13 @@ cloudabi64_fixup_tcb(register_t **stack_base, struct i * containing a pointer to the TCB. %fs base will point to this. */ tcbptr = (register_t)*stack_base; - return (copyout(&tcbptr, --*stack_base, sizeof(tcbptr))); + *stack_base -= sizeof(tcbptr); + return (copyout(&tcbptr, (void *)*stack_base, sizeof(tcbptr))); } static void cloudabi64_proc_setregs(struct thread *td, struct image_params *imgp, - unsigned long stack) + uintptr_t stack) { struct trapframe *regs; Modified: projects/nfsv42/sys/amd64/ia32/ia32_signal.c ============================================================================== --- projects/nfsv42/sys/amd64/ia32/ia32_signal.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/ia32/ia32_signal.c Sun Dec 8 22:36:37 2019 (r355539) @@ -936,7 +936,7 @@ freebsd32_sigreturn(td, uap) * Clear registers on exec */ void -ia32_setregs(struct thread *td, struct image_params *imgp, u_long stack) +ia32_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack) { struct trapframe *regs; struct pcb *pcb; Modified: projects/nfsv42/sys/amd64/include/_bus.h ============================================================================== --- projects/nfsv42/sys/amd64/include/_bus.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/include/_bus.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/amd64/linux/Makefile ============================================================================== --- projects/nfsv42/sys/amd64/linux/Makefile Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/linux/Makefile Sun Dec 8 22:36:37 2019 (r355539) @@ -7,11 +7,19 @@ .include <src.lua.mk> +MAKESYSCALLS= ../../tools/makesyscalls.lua +SRCS= syscalls.conf \ + syscalls.master +GENERATED= linux_proto.h \ + linux_syscall.h \ + linux_syscalls.c \ + linux_sysent.c \ + linux_systrace_args.c + all: @echo "make sysent only" -sysent: linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c +sysent: ${GENERATED} -linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c: \ - ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf - ${LUA} ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf +${GENERATED}: ${MAKESYSCALLS} ${SRCS} + ${LUA} ${MAKESYSCALLS} syscalls.master syscalls.conf Modified: projects/nfsv42/sys/amd64/linux/linux_sysvec.c ============================================================================== --- projects/nfsv42/sys/amd64/linux/linux_sysvec.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/linux/linux_sysvec.c Sun Dec 8 22:36:37 2019 (r355539) @@ -97,8 +97,8 @@ extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); static int linux_copyout_strings(struct image_params *imgp, - register_t **stack_base); -static int linux_fixup_elf(register_t **stack_base, + uintptr_t *stack_base); +static int linux_fixup_elf(uintptr_t *stack_base, struct image_params *iparams); static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel); static void linux_vdso_install(void *param); @@ -106,7 +106,7 @@ static void linux_vdso_deinstall(void *param); static void linux_set_syscall_retval(struct thread *td, int error); static int linux_fetch_syscall_args(struct thread *td); static void linux_exec_setregs(struct thread *td, struct image_params *imgp, - u_long stack); + uintptr_t stack); static int linux_vsyscall(struct thread *td); #define LINUX_T_UNKNOWN 255 @@ -224,7 +224,7 @@ linux_set_syscall_retval(struct thread *td, int error) } static int -linux_copyout_auxargs(struct image_params *imgp, u_long *base) +linux_copyout_auxargs(struct image_params *imgp, uintptr_t *base) { Elf_Auxargs *args; Elf_Auxinfo *argarray, *pos; @@ -274,7 +274,7 @@ linux_copyout_auxargs(struct image_params *imgp, u_lon } static int -linux_fixup_elf(register_t **stack_base, struct image_params *imgp) +linux_fixup_elf(uintptr_t *stack_base, struct image_params *imgp) { Elf_Addr *base; @@ -283,7 +283,7 @@ linux_fixup_elf(register_t **stack_base, struct image_ if (suword(base, (uint64_t)imgp->args->argc) == -1) return (EFAULT); - *stack_base = (register_t *)base; + *stack_base = (uintptr_t)base; return (0); } @@ -293,11 +293,12 @@ linux_fixup_elf(register_t **stack_base, struct image_ * as the initial stack pointer. */ static int -linux_copyout_strings(struct image_params *imgp, register_t **stack_base) +linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) { int argc, envc, error; char **vectp; - char *stringp, *destp; + char *stringp; + uintptr_t destp, ustringp; struct ps_strings *arginfo; char canary[LINUX_AT_RANDOM_LEN]; size_t execpath_len; @@ -311,43 +312,45 @@ linux_copyout_strings(struct image_params *imgp, regis p = imgp->proc; arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; - destp = (caddr_t)arginfo - SPARE_USRSPACE - - roundup(sizeof(canary), sizeof(char *)) - - roundup(execpath_len, sizeof(char *)) - - roundup(ARG_MAX - imgp->args->stringspace, sizeof(char *)); + destp = (uintptr_t)arginfo; if (execpath_len != 0) { - imgp->execpathp = (uintptr_t)arginfo - execpath_len; - error = copyout(imgp->execpath, (void *)imgp->execpathp, - execpath_len); + destp -= execpath_len; + destp = rounddown2(destp, sizeof(void *)); + imgp->execpathp = destp; + error = copyout(imgp->execpath, (void *)destp, execpath_len); if (error != 0) return (error); } /* Prepare the canary for SSP. */ arc4rand(canary, sizeof(canary), 0); - imgp->canary = (uintptr_t)arginfo - - roundup(execpath_len, sizeof(char *)) - - roundup(sizeof(canary), sizeof(char *)); - error = copyout(canary, (void *)imgp->canary, sizeof(canary)); + destp -= roundup(sizeof(canary), sizeof(void *)); + imgp->canary = destp; + error = copyout(canary, (void *)destp, sizeof(canary)); if (error != 0) return (error); - vectp = (char **)destp; + /* Allocate room for the argument and environment strings. */ + destp -= ARG_MAX - imgp->args->stringspace; + destp = rounddown2(destp, sizeof(void *)); + ustringp = destp; /* * Starting with 2.24, glibc depends on a 16-byte stack alignment. * One "long argc" will be prepended later. */ - vectp = (char **)((((uintptr_t)vectp + 8) & ~0xF) - 8); + if (destp % 16 == 0) + destp -= 8; if (imgp->auxargs) { - error = imgp->sysent->sv_copyout_auxargs(imgp, - (u_long *)&vectp); + error = imgp->sysent->sv_copyout_auxargs(imgp, &destp); if (error != 0) return (error); } + vectp = (char **)destp; + /* * Allocate room for the argv[] and env vectors including the * terminating NULL pointers. @@ -355,14 +358,15 @@ linux_copyout_strings(struct image_params *imgp, regis vectp -= imgp->args->argc + 1 + imgp->args->envc + 1; /* vectp also becomes our initial stack base. */ - *stack_base = (register_t *)vectp; + *stack_base = (uintptr_t)vectp; stringp = imgp->args->begin_argv; argc = imgp->args->argc; envc = imgp->args->envc; /* Copy out strings - arguments and environment. */ - error = copyout(stringp, destp, ARG_MAX - imgp->args->stringspace); + error = copyout(stringp, (void *)ustringp, + ARG_MAX - imgp->args->stringspace); if (error != 0) return (error); @@ -373,11 +377,11 @@ linux_copyout_strings(struct image_params *imgp, regis /* Fill in argument portion of vector table. */ for (; argc > 0; --argc) { - if (suword(vectp++, (long)(intptr_t)destp) != 0) + if (suword(vectp++, ustringp) != 0) return (EFAULT); while (*stringp++ != 0) - destp++; - destp++; + ustringp++; + ustringp++; } /* A null vector table pointer separates the argp's from the envp's. */ @@ -390,11 +394,11 @@ linux_copyout_strings(struct image_params *imgp, regis /* Fill in environment portion of vector table. */ for (; envc > 0; --envc) { - if (suword(vectp++, (long)(intptr_t)destp) != 0) + if (suword(vectp++, ustringp) != 0) return (EFAULT); while (*stringp++ != 0) - destp++; - destp++; + ustringp++; + ustringp++; } /* The end of the vector table is a null pointer. */ @@ -408,7 +412,8 @@ linux_copyout_strings(struct image_params *imgp, regis * Reset registers to default values on exec. */ static void -linux_exec_setregs(struct thread *td, struct image_params *imgp, u_long stack) +linux_exec_setregs(struct thread *td, struct image_params *imgp, + uintptr_t stack) { struct trapframe *regs; struct pcb *pcb; Modified: projects/nfsv42/sys/amd64/linux32/Makefile ============================================================================== --- projects/nfsv42/sys/amd64/linux32/Makefile Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/linux32/Makefile Sun Dec 8 22:36:37 2019 (r355539) @@ -7,11 +7,19 @@ .include <src.lua.mk> +MAKESYSCALLS= ../../tools/makesyscalls.lua +SRCS= syscalls.conf \ + syscalls.master +GENERATED= linux32_proto.h \ + linux32_syscall.h \ + linux32_syscalls.c \ + linux32_sysent.c \ + linux32_systrace_args.c + all: @echo "make sysent only" -sysent: linux32_sysent.c linux32_syscall.h linux32_proto.h linux32_syscalls.c linux32_systrace_args.c +sysent: ${GENERATED} -linux32_sysent.c linux32_syscall.h linux32_proto.h linux32_syscalls.c linux32_systrace_args.c: ../../tools/makesyscalls.lua \ - syscalls.master ${.CURDIR}/syscalls.conf - ${LUA} ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf +${GENERATED}: ${MAKESYSCALLS} ${SRCS} + ${LUA} ${MAKESYSCALLS} syscalls.master syscalls.conf Modified: projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c Sun Dec 8 22:36:37 2019 (r355539) @@ -101,13 +101,13 @@ extern struct sysent linux32_sysent[LINUX32_SYS_MAXSYS SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); -static int linux_fixup_elf(register_t **stack_base, +static int linux_fixup_elf(uintptr_t *stack_base, struct image_params *iparams); static int linux_copyout_strings(struct image_params *imgp, - register_t **stack_base); + uintptr_t *stack_base); static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void linux_exec_setregs(struct thread *td, - struct image_params *imgp, u_long stack); + struct image_params *imgp, uintptr_t stack); static void linux32_fixlimit(struct rlimit *rl, int which); static bool linux32_trans_osrel(const Elf_Note *note, int32_t *osrel); static void linux_vdso_install(void *param); @@ -246,7 +246,7 @@ linux_copyout_auxargs(struct image_params *imgp, u_lon } static int -linux_fixup_elf(register_t **stack_base, struct image_params *imgp) +linux_fixup_elf(uintptr_t *stack_base, struct image_params *imgp) { Elf32_Addr *base; @@ -254,7 +254,7 @@ linux_fixup_elf(register_t **stack_base, struct image_ base--; if (suword32(base, (uint32_t)imgp->args->argc) == -1) return (EFAULT); - *stack_base = (register_t *)base; + *stack_base = (uintptr_t)base; return (0); } @@ -677,7 +677,8 @@ linux32_fetch_syscall_args(struct thread *td) * XXX copied from ia32_signal.c. */ static void -linux_exec_setregs(struct thread *td, struct image_params *imgp, u_long stack) +linux_exec_setregs(struct thread *td, struct image_params *imgp, + uintptr_t stack) { struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; @@ -721,11 +722,12 @@ linux_exec_setregs(struct thread *td, struct image_par * XXX copied from ia32_sysvec.c. */ static int -linux_copyout_strings(struct image_params *imgp, register_t **stack_base) +linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) { int argc, envc, error; u_int32_t *vectp; - char *stringp, *destp; + char *stringp; + uintptr_t destp, ustringp; struct linux32_ps_strings *arginfo; char canary[LINUX_AT_RANDOM_LEN]; size_t execpath_len; @@ -737,36 +739,38 @@ linux_copyout_strings(struct image_params *imgp, regis execpath_len = 0; arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS; - destp = (caddr_t)arginfo - SPARE_USRSPACE - - roundup(sizeof(canary), sizeof(char *)) - - roundup(execpath_len, sizeof(char *)) - - roundup(ARG_MAX - imgp->args->stringspace, sizeof(char *)); + destp = (uintptr_t)arginfo; if (execpath_len != 0) { - imgp->execpathp = (uintptr_t)arginfo - execpath_len; - error = copyout(imgp->execpath, (void *)imgp->execpathp, - execpath_len); + destp -= execpath_len; + destp = rounddown2(destp, sizeof(void *)); + imgp->execpathp = destp; + error = copyout(imgp->execpath, (void *)destp, execpath_len); if (error != 0) return (error); } /* Prepare the canary for SSP. */ arc4rand(canary, sizeof(canary), 0); - imgp->canary = (uintptr_t)arginfo - - roundup(execpath_len, sizeof(char *)) - - roundup(sizeof(canary), sizeof(char *)); - error = copyout(canary, (void *)imgp->canary, sizeof(canary)); + destp -= roundup(sizeof(canary), sizeof(void *)); + imgp->canary = destp; + error = copyout(canary, (void *)destp, sizeof(canary)); if (error != 0) return (error); - vectp = (uint32_t *)destp; + /* Allocate room for the argument and environment strings. */ + destp -= ARG_MAX - imgp->args->stringspace; + destp = rounddown2(destp, sizeof(void *)); + ustringp = destp; + if (imgp->auxargs) { - error = imgp->sysent->sv_copyout_auxargs(imgp, - (u_long *)&vectp); + error = imgp->sysent->sv_copyout_auxargs(imgp, &destp); if (error != 0) return (error); } + vectp = (uint32_t *)destp; + /* * Allocate room for the argv[] and env vectors including the * terminating NULL pointers. @@ -774,13 +778,15 @@ linux_copyout_strings(struct image_params *imgp, regis vectp -= imgp->args->argc + 1 + imgp->args->envc + 1; /* vectp also becomes our initial stack base. */ - *stack_base = (register_t *)vectp; + *stack_base = (uintptr_t)vectp; stringp = imgp->args->begin_argv; argc = imgp->args->argc; envc = imgp->args->envc; + /* Copy out strings - arguments and environment. */ - error = copyout(stringp, destp, ARG_MAX - imgp->args->stringspace); + error = copyout(stringp, (void *)ustringp, + ARG_MAX - imgp->args->stringspace); if (error != 0) return (error); @@ -791,11 +797,11 @@ linux_copyout_strings(struct image_params *imgp, regis /* Fill in argument portion of vector table. */ for (; argc > 0; --argc) { - if (suword32(vectp++, (uint32_t)(intptr_t)destp) != 0) + if (suword32(vectp++, ustringp) != 0) return (EFAULT); while (*stringp++ != 0) - destp++; - destp++; + ustringp++; + ustringp++; } /* A null vector table pointer separates the argp's from the envp's. */ @@ -808,11 +814,11 @@ linux_copyout_strings(struct image_params *imgp, regis /* Fill in environment portion of vector table. */ for (; envc > 0; --envc) { - if (suword32(vectp++, (uint32_t)(intptr_t)destp) != 0) + if (suword32(vectp++, ustringp) != 0) return (EFAULT); while (*stringp++ != 0) - destp++; - destp++; + ustringp++; + ustringp++; } /* The end of the vector table is a null pointer. */ Modified: projects/nfsv42/sys/amd64/sgx/sgx.c ============================================================================== --- projects/nfsv42/sys/amd64/sgx/sgx.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/amd64/sgx/sgx.c Sun Dec 8 22:36:37 2019 (r355539) @@ -389,14 +389,16 @@ sgx_enclave_remove(struct sgx_softc *sc, * First remove all the pages except SECS, * then remove SECS page. */ - p_secs = NULL; +restart: TAILQ_FOREACH_SAFE(p, &object->memq, listq, p_next) { - if (p->pindex == SGX_SECS_VM_OBJECT_INDEX) { - p_secs = p; + if (p->pindex == SGX_SECS_VM_OBJECT_INDEX) continue; - } + if (vm_page_busy_acquire(p, VM_ALLOC_WAITFAIL) == 0) + goto restart; sgx_page_remove(sc, p); } + p_secs = vm_page_grab(object, SGX_SECS_VM_OBJECT_INDEX, + VM_ALLOC_NOCREAT); /* Now remove SECS page */ if (p_secs != NULL) sgx_page_remove(sc, p_secs); @@ -723,8 +725,9 @@ sgx_ioctl_create(struct sgx_softc *sc, struct sgx_encl if ((sc->state & SGX_STATE_RUNNING) == 0) { mtx_unlock(&sc->mtx); /* Remove VA page that was just created for SECS page. */ - p = vm_page_lookup(enclave->object, - - SGX_VA_PAGES_OFFS - SGX_SECS_VM_OBJECT_INDEX); + p = vm_page_grab(enclave->object, + - SGX_VA_PAGES_OFFS - SGX_SECS_VM_OBJECT_INDEX, + VM_ALLOC_NOCREAT); sgx_page_remove(sc, p); VM_OBJECT_WUNLOCK(object); goto error; @@ -736,8 +739,9 @@ sgx_ioctl_create(struct sgx_softc *sc, struct sgx_encl dprintf("%s: gp fault\n", __func__); mtx_unlock(&sc->mtx); /* Remove VA page that was just created for SECS page. */ - p = vm_page_lookup(enclave->object, - - SGX_VA_PAGES_OFFS - SGX_SECS_VM_OBJECT_INDEX); + p = vm_page_grab(enclave->object, + - SGX_VA_PAGES_OFFS - SGX_SECS_VM_OBJECT_INDEX, + VM_ALLOC_NOCREAT); sgx_page_remove(sc, p); VM_OBJECT_WUNLOCK(object); goto error; Modified: projects/nfsv42/sys/arm/allwinner/a10/a10_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a10/a10_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a10/a10_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a10_ahci.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a10_ahci.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a10_ahci.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,7 +1,6 @@ /*- - * Copyright (c) 2014-2015 M. Warner Losh <imp@freebsd.org> - * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org> - * All rights reserved. + * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org> All rights reserved. + * Copyright (c) 2014-2015 M. Warner Losh <imp@FreeBSD.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a10_fb.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a10_fb.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a10_fb.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a10_hdmi.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a10_hdmi.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a10_hdmi.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a10_hdmiaudio.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a10_hdmiaudio.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a10_hdmiaudio.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a13/a13_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a13/a13_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a13/a13_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a20/a20_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a20/a20_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a20/a20_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a31/a31_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a31/a31_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a31/a31_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a31/a31_r_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a31/a31_r_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a31/a31_r_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a31/a31s_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a31/a31s_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a31/a31s_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a33/a33_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a33/a33_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a33/a33_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a64/a64_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a64/a64_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a64/a64_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a64/a64_r_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a64/a64_r_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a64/a64_r_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a83t/a83t_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a83t/a83t_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a83t/a83t_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/a83t/a83t_r_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/a83t/a83t_r_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/a83t/a83t_r_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/allwinner_pinctrl.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/allwinner_pinctrl.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/allwinner_pinctrl.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_ccu.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_ccu.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_ccu.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_gmacclk.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_gmacclk.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_gmacclk.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_machdep.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_machdep.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_machdep.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2015 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_mp.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_mp.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_mp.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_nmi.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_nmi.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_nmi.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_reset.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_reset.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_reset.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_rsb.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_rsb.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_rsb.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_sid.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_sid.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_sid.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_sid.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_sid.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_sid.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_thermal.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_thermal.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_thermal.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_ts.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_ts.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_ts.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/aw_usbphy.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/aw_usbphy.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/aw_usbphy.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/axp209.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/axp209.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/axp209.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,7 +1,6 @@ /*- * Copyright (c) 2015-2016 Emmanuel Vadot <manu@freebsd.org> * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/axp209reg.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/axp209reg.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/axp209reg.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Emmanuel Vadot <manu@freeebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/axp81x.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/axp81x.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/axp81x.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,7 +1,6 @@ /*- * Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org> * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/clkng/aw_clk.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/clkng/aw_clk.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/clkng/aw_clk.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nkmp.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nkmp.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nkmp.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_nm.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/clkng/aw_clk_prediv_mux.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/h3/h3_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/h3/h3_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/h3/h3_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016-2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/h3/h3_r_padconf.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/h3/h3_r_padconf.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/h3/h3_r_padconf.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016-2017 Emmanuel Vadot <manu@freebsd.org> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/if_awg.c ============================================================================== --- projects/nfsv42/sys/arm/allwinner/if_awg.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/if_awg.c Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/allwinner/if_awgreg.h ============================================================================== --- projects/nfsv42/sys/arm/allwinner/if_awgreg.h Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/allwinner/if_awgreg.h Sun Dec 8 22:36:37 2019 (r355539) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: projects/nfsv42/sys/arm/arm/machdep.c ============================================================================== --- projects/nfsv42/sys/arm/arm/machdep.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/arm/machdep.c Sun Dec 8 22:36:37 2019 (r355539) @@ -412,7 +412,7 @@ spinlock_exit(void) * Clear registers on exec */ void -exec_setregs(struct thread *td, struct image_params *imgp, u_long stack) +exec_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack) { struct trapframe *tf = td->td_frame; Modified: projects/nfsv42/sys/arm/arm/mp_machdep.c ============================================================================== --- projects/nfsv42/sys/arm/arm/mp_machdep.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/arm/mp_machdep.c Sun Dec 8 22:36:37 2019 (r355539) @@ -106,8 +106,6 @@ check_ap(void) return (-2); } -extern unsigned char _end[]; - /* Initialize and fire up non-boot processors */ void cpu_mp_start(void) Modified: projects/nfsv42/sys/arm/arm/unwind.c ============================================================================== --- projects/nfsv42/sys/arm/arm/unwind.c Sun Dec 8 22:33:51 2019 (r355538) +++ projects/nfsv42/sys/arm/arm/unwind.c Sun Dec 8 22:36:37 2019 (r355539) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/linker.h> +#include <machine/machdep.h> #include <machine/stack.h> #include "linker_if.h" @@ -61,12 +62,6 @@ __FBSDID("$FreeBSD$"); #define EXIDX_CANTUNWIND 1 /* - * These are set in the linker script. Their addresses will be - * either the start or end of the exception table or index. - */ -extern int exidx_start, exidx_end; - -/* * Entry types. * These are the only entry types that have been seen in the kernel. */ @@ -154,9 +149,9 @@ find_index(uint32_t addr, int search_modules) int32_t prel31_addr; uint32_t func_addr; - start = (struct unwind_idx *)&exidx_start; - idx_start = (caddr_t)&exidx_start; - idx_end = (caddr_t)&exidx_end; + start = (struct unwind_idx *)&_exidx_start; + idx_start = (caddr_t)&_exidx_start; + idx_end = (caddr_t)&_exidx_end; /* This may acquire a lock */ if (search_modules) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912082236.xB8MacgZ089868>