From owner-svn-src-projects@freebsd.org Sun Dec 8 22:36:50 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3888D1BC8E2 for ; Sun, 8 Dec 2019 22:36:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47WLm21SvMz3xSG; Sun, 8 Dec 2019 22:36:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D181935F; Sun, 8 Dec 2019 22:36:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB8Mao6E089925; Sun, 8 Dec 2019 22:36:50 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB8MacgZ089868; Sun, 8 Dec 2019 22:36:38 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201912082236.xB8MacgZ089868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 8 Dec 2019 22:36:38 +0000 (UTC) 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... X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: 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/allwinner/a13 arm/allwinner/a20 a... X-SVN-Commit-Revision: 355539 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2019 22:36:50 -0000 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 * * 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 +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 +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 - * 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 - * Copyright (c) 2015 Luiz Otavio O Souza - * All rights reserved. + * Copyright (c) 2015 Luiz Otavio O Souza All rights reserved. + * Copyright (c) 2014-2015 M. Warner Losh * * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 * Copyright (c) 2016 Jared McNeill - * 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 - * 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 * Copyright (c) 2016 Jared McNeill - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 - * 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 #include +#include #include #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 *** From owner-svn-src-projects@freebsd.org Thu Dec 12 22:36:50 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 479D11DC48D for ; Thu, 12 Dec 2019 22:36:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47YpZB1NN1z4C94; Thu, 12 Dec 2019 22:36:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C1EA2A30; Thu, 12 Dec 2019 22:36:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBCMan4I012124; Thu, 12 Dec 2019 22:36:49 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBCMamPl012114; Thu, 12 Dec 2019 22:36:48 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201912122236.xBCMamPl012114@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 12 Dec 2019 22:36:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r355675 - in projects/nfsv42/sys: amd64/amd64 amd64/include amd64/linux amd64/linux32 arm/broadcom/bcm2835 arm/include arm/linux arm64/arm64 arm64/conf arm64/include arm64/linux arm64/r... X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfsv42/sys: amd64/amd64 amd64/include amd64/linux amd64/linux32 arm/broadcom/bcm2835 arm/include arm/linux arm64/arm64 arm64/conf arm64/include arm64/linux arm64/rockchip arm64/rockchip/cl... X-SVN-Commit-Revision: 355675 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2019 22:36:50 -0000 Author: rmacklem Date: Thu Dec 12 22:36:47 2019 New Revision: 355675 URL: https://svnweb.freebsd.org/changeset/base/355675 Log: Merge in an up to date kernel from head. Added: projects/nfsv42/sys/arm/linux/Makefile - copied unchanged from r355674, head/sys/arm/linux/Makefile projects/nfsv42/sys/arm/linux/linux_proto.h - copied unchanged from r355674, head/sys/arm/linux/linux_proto.h projects/nfsv42/sys/arm/linux/linux_syscall.h - copied unchanged from r355674, head/sys/arm/linux/linux_syscall.h projects/nfsv42/sys/arm/linux/linux_syscalls.c - copied unchanged from r355674, head/sys/arm/linux/linux_syscalls.c projects/nfsv42/sys/arm/linux/linux_sysent.c - copied unchanged from r355674, head/sys/arm/linux/linux_sysent.c projects/nfsv42/sys/arm/linux/linux_systrace_args.c - copied unchanged from r355674, head/sys/arm/linux/linux_systrace_args.c projects/nfsv42/sys/arm/linux/syscalls.conf - copied unchanged from r355674, head/sys/arm/linux/syscalls.conf projects/nfsv42/sys/dev/cxgbe/firmware/t4fw-1.24.11.0.bin - copied unchanged from r355674, head/sys/dev/cxgbe/firmware/t4fw-1.24.11.0.bin projects/nfsv42/sys/dev/cxgbe/firmware/t5fw-1.24.11.0.bin - copied unchanged from r355674, head/sys/dev/cxgbe/firmware/t5fw-1.24.11.0.bin projects/nfsv42/sys/dev/cxgbe/firmware/t6fw-1.24.11.0.bin - copied unchanged from r355674, head/sys/dev/cxgbe/firmware/t6fw-1.24.11.0.bin projects/nfsv42/sys/modules/rockchip/rk_dwmmc/ - copied from r355674, head/sys/modules/rockchip/rk_dwmmc/ projects/nfsv42/sys/powerpc/powernv/opal_dbg.c - copied unchanged from r355674, head/sys/powerpc/powernv/opal_dbg.c Deleted: projects/nfsv42/sys/dev/cxgbe/firmware/t4fw-1.23.0.0.bin.uu projects/nfsv42/sys/dev/cxgbe/firmware/t5fw-1.23.0.0.bin.uu projects/nfsv42/sys/dev/cxgbe/firmware/t6fw-1.23.0.0.bin.uu Modified: projects/nfsv42/sys/amd64/amd64/pmap.c projects/nfsv42/sys/amd64/include/pmap.h projects/nfsv42/sys/amd64/linux/linux_sysvec.c projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h projects/nfsv42/sys/arm/include/pmap.h projects/nfsv42/sys/arm/linux/syscalls.master projects/nfsv42/sys/arm64/arm64/locore.S projects/nfsv42/sys/arm64/arm64/machdep_boot.c projects/nfsv42/sys/arm64/arm64/pmap.c projects/nfsv42/sys/arm64/conf/GENERIC projects/nfsv42/sys/arm64/include/armreg.h projects/nfsv42/sys/arm64/include/pmap.h projects/nfsv42/sys/arm64/linux/linux_sysvec.c projects/nfsv42/sys/arm64/rockchip/clk/rk3328_cru.c projects/nfsv42/sys/arm64/rockchip/rk_pinctrl.c projects/nfsv42/sys/cam/ata/ata_da.c projects/nfsv42/sys/cam/cam_xpt.c projects/nfsv42/sys/cam/scsi/scsi_cd.c projects/nfsv42/sys/cam/scsi/scsi_da.c projects/nfsv42/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/nfsv42/sys/compat/freebsd32/freebsd32_misc.c projects/nfsv42/sys/conf/files projects/nfsv42/sys/conf/files.arm64 projects/nfsv42/sys/conf/files.powerpc projects/nfsv42/sys/contrib/ipfilter/netinet/fil.c projects/nfsv42/sys/contrib/ipfilter/netinet/ip_fil.h projects/nfsv42/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/nfsv42/sys/dev/aic7xxx/aic_osm_lib.h projects/nfsv42/sys/dev/cxgbe/adapter.h projects/nfsv42/sys/dev/cxgbe/firmware/t4fw_interface.h projects/nfsv42/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt projects/nfsv42/sys/dev/cxgbe/iw_cxgbe/qp.c projects/nfsv42/sys/dev/cxgbe/t4_main.c projects/nfsv42/sys/dev/cxgbe/t4_netmap.c projects/nfsv42/sys/dev/cxgbe/t4_sge.c projects/nfsv42/sys/dev/gpio/gpioths.c projects/nfsv42/sys/dev/ichiic/ig4_acpi.c projects/nfsv42/sys/dev/ichiic/ig4_pci.c projects/nfsv42/sys/dev/isp/isp_freebsd.c projects/nfsv42/sys/dev/kbdmux/kbdmux.c projects/nfsv42/sys/dev/mmc/host/dwmmc.c projects/nfsv42/sys/dev/mmc/host/dwmmc_altera.c projects/nfsv42/sys/dev/mmc/host/dwmmc_hisi.c projects/nfsv42/sys/dev/mmc/host/dwmmc_rockchip.c projects/nfsv42/sys/dev/mmc/host/dwmmc_samsung.c projects/nfsv42/sys/dev/mmc/host/dwmmc_var.h projects/nfsv42/sys/dev/mpt/mpt_cam.c projects/nfsv42/sys/dev/mpt/mpt_raid.c projects/nfsv42/sys/dev/nvme/nvme.c projects/nfsv42/sys/dev/nvme/nvme_ctrlr.c projects/nfsv42/sys/dev/ocs_fc/ocs_os.c projects/nfsv42/sys/dev/ow/owc_gpiobus.c projects/nfsv42/sys/dev/ppbus/lpt.c projects/nfsv42/sys/dev/sbni/if_sbni.c projects/nfsv42/sys/dev/smc/if_smc.c projects/nfsv42/sys/dev/sound/pci/hda/hdaa_patches.c projects/nfsv42/sys/dev/sound/pci/hda/hdac.h projects/nfsv42/sys/dev/syscons/syscons.c projects/nfsv42/sys/dev/uart/uart_core.c projects/nfsv42/sys/dev/usb/serial/uslcom.c projects/nfsv42/sys/dev/virtio/balloon/virtio_balloon.c projects/nfsv42/sys/dev/vt/hw/ofwfb/ofwfb.c projects/nfsv42/sys/fs/tmpfs/tmpfs_subr.c projects/nfsv42/sys/fs/tmpfs/tmpfs_vnops.c projects/nfsv42/sys/i386/i386/pmap.c projects/nfsv42/sys/i386/include/pmap.h projects/nfsv42/sys/i386/linux/linux_sysvec.c projects/nfsv42/sys/kern/imgact_elf.c projects/nfsv42/sys/kern/kern_descrip.c projects/nfsv42/sys/kern/kern_exec.c projects/nfsv42/sys/kern/kern_lock.c projects/nfsv42/sys/kern/kern_syscalls.c projects/nfsv42/sys/kern/kern_timeout.c projects/nfsv42/sys/kern/sched_ule.c projects/nfsv42/sys/kern/vfs_bio.c projects/nfsv42/sys/kern/vfs_default.c projects/nfsv42/sys/kern/vfs_subr.c projects/nfsv42/sys/kern/vfs_syscalls.c projects/nfsv42/sys/mips/include/pmap.h projects/nfsv42/sys/mips/mips/pmap.c projects/nfsv42/sys/modules/cxgbe/t4_firmware/Makefile projects/nfsv42/sys/modules/cxgbe/t5_firmware/Makefile projects/nfsv42/sys/modules/cxgbe/t6_firmware/Makefile projects/nfsv42/sys/modules/ipfw_nat64/Makefile projects/nfsv42/sys/modules/rockchip/Makefile projects/nfsv42/sys/netgraph/netflow/ng_netflow.h projects/nfsv42/sys/netinet/tcp_timer.c projects/nfsv42/sys/netpfil/ipfw/ip_fw2.c projects/nfsv42/sys/netpfil/ipfw/nat64/nat64_translate.c projects/nfsv42/sys/powerpc/aim/mmu_oea.c projects/nfsv42/sys/powerpc/aim/mmu_oea64.c projects/nfsv42/sys/powerpc/booke/spe.c projects/nfsv42/sys/powerpc/include/pmap.h projects/nfsv42/sys/powerpc/ofw/ofw_real.c projects/nfsv42/sys/powerpc/pseries/phyp_dbg.c projects/nfsv42/sys/powerpc/pseries/platform_chrp.c projects/nfsv42/sys/riscv/include/pmap.h projects/nfsv42/sys/riscv/riscv/pmap.c projects/nfsv42/sys/sparc64/include/pmap.h projects/nfsv42/sys/sys/_callout.h projects/nfsv42/sys/sys/file.h projects/nfsv42/sys/sys/imgact_elf.h projects/nfsv42/sys/sys/lockmgr.h projects/nfsv42/sys/sys/param.h projects/nfsv42/sys/sys/syscallsubr.h projects/nfsv42/sys/sys/sysent.h projects/nfsv42/sys/sys/vnode.h projects/nfsv42/sys/tools/makesyscalls.lua projects/nfsv42/sys/ufs/ufs/ufs_extern.h projects/nfsv42/sys/ufs/ufs/ufs_inode.c projects/nfsv42/sys/ufs/ufs/ufs_vnops.c projects/nfsv42/sys/vm/memguard.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_map.c projects/nfsv42/sys/vm/vm_map.h projects/nfsv42/sys/vm/vm_mmap.c 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/vm_pageout.c projects/nfsv42/sys/vm/vm_swapout.c projects/nfsv42/sys/x86/x86/cpu_machdep.c Directory Properties: projects/nfsv42/sys/ (props changed) projects/nfsv42/sys/cddl/contrib/opensolaris/ (props changed) projects/nfsv42/sys/contrib/ipfilter/ (props changed) Modified: projects/nfsv42/sys/amd64/amd64/pmap.c ============================================================================== --- projects/nfsv42/sys/amd64/amd64/pmap.c Thu Dec 12 22:00:10 2019 (r355674) +++ projects/nfsv42/sys/amd64/amd64/pmap.c Thu Dec 12 22:36:47 2019 (r355675) @@ -6104,7 +6104,7 @@ retry: ("pmap_enter: no PV entry for %#lx", va)); if ((newpte & PG_MANAGED) == 0) free_pv_entry(pmap, pv); - if ((om->aflags & PGA_WRITEABLE) != 0 && + if ((om->a.flags & PGA_WRITEABLE) != 0 && TAILQ_EMPTY(&om->md.pv_list) && ((om->flags & PG_FICTITIOUS) != 0 || TAILQ_EMPTY(&pa_to_pvh(opa)->pv_list))) @@ -7297,7 +7297,7 @@ pmap_remove_pages(pmap_t pmap) pvh->pv_gen++; if (TAILQ_EMPTY(&pvh->pv_list)) { for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++) - if ((mt->aflags & PGA_WRITEABLE) != 0 && + if ((mt->a.flags & PGA_WRITEABLE) != 0 && TAILQ_EMPTY(&mt->md.pv_list)) vm_page_aflag_clear(mt, PGA_WRITEABLE); } @@ -7315,7 +7315,7 @@ pmap_remove_pages(pmap_t pmap) pmap_resident_count_dec(pmap, 1); TAILQ_REMOVE(&m->md.pv_list, pv, pv_next); m->md.pv_gen++; - if ((m->aflags & PGA_WRITEABLE) != 0 && + if ((m->a.flags & PGA_WRITEABLE) != 0 && TAILQ_EMPTY(&m->md.pv_list) && (m->flags & PG_FICTITIOUS) == 0) { pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); Modified: projects/nfsv42/sys/amd64/include/pmap.h ============================================================================== --- projects/nfsv42/sys/amd64/include/pmap.h Thu Dec 12 22:00:10 2019 (r355674) +++ projects/nfsv42/sys/amd64/include/pmap.h Thu Dec 12 22:36:47 2019 (r355675) @@ -415,8 +415,8 @@ extern int pmap_pcid_enabled; extern int invpcid_works; #define pmap_page_get_memattr(m) ((vm_memattr_t)(m)->md.pat_mode) -#define pmap_page_is_write_mapped(m) (((m)->aflags & PGA_WRITEABLE) != 0) -#define pmap_unmapbios(va, sz) pmap_unmapdev((va), (sz)) +#define pmap_page_is_write_mapped(m) (((m)->a.flags & PGA_WRITEABLE) != 0) +#define pmap_unmapbios(va, sz) pmap_unmapdev((va), (sz)) struct thread; Modified: projects/nfsv42/sys/amd64/linux/linux_sysvec.c ============================================================================== --- projects/nfsv42/sys/amd64/linux/linux_sysvec.c Thu Dec 12 22:00:10 2019 (r355674) +++ projects/nfsv42/sys/amd64/linux/linux_sysvec.c Thu Dec 12 22:36:47 2019 (r355675) @@ -224,11 +224,10 @@ linux_set_syscall_retval(struct thread *td, int error) } static int -linux_copyout_auxargs(struct image_params *imgp, uintptr_t *base) +linux_copyout_auxargs(struct image_params *imgp, uintptr_t base) { Elf_Auxargs *args; Elf_Auxinfo *argarray, *pos; - u_long auxlen; struct proc *p; int error, issetugid; @@ -266,9 +265,8 @@ linux_copyout_auxargs(struct image_params *imgp, uintp imgp->auxargs = NULL; KASSERT(pos - argarray <= LINUX_AT_COUNT, ("Too many auxargs")); - auxlen = sizeof(*argarray) * (pos - argarray); - *base -= auxlen; - error = copyout(argarray, (void *)*base, auxlen); + error = copyout(argarray, (void *)base, + sizeof(*argarray) * LINUX_AT_COUNT); free(argarray, M_TEMP); return (error); } @@ -336,17 +334,13 @@ linux_copyout_strings(struct image_params *imgp, uintp 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. - */ - if (destp % 16 == 0) - destp -= 8; - if (imgp->auxargs) { - error = imgp->sysent->sv_copyout_auxargs(imgp, &destp); - if (error != 0) - return (error); + /* + * Allocate room on the stack for the ELF auxargs + * array. It has LINUX_AT_COUNT entries. + */ + destp -= LINUX_AT_COUNT * sizeof(Elf64_Auxinfo); + destp = rounddown2(destp, sizeof(void *)); } vectp = (char **)destp; @@ -357,6 +351,12 @@ linux_copyout_strings(struct image_params *imgp, uintp */ vectp -= imgp->args->argc + 1 + imgp->args->envc + 1; + /* + * 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); + /* vectp also becomes our initial stack base. */ *stack_base = (uintptr_t)vectp; @@ -404,6 +404,14 @@ linux_copyout_strings(struct image_params *imgp, uintp /* The end of the vector table is a null pointer. */ if (suword(vectp, 0) != 0) return (EFAULT); + + if (imgp->auxargs) { + vectp++; + error = imgp->sysent->sv_copyout_auxargs(imgp, + (uintptr_t)vectp); + if (error != 0) + return (error); + } return (0); } Modified: projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c Thu Dec 12 22:00:10 2019 (r355674) +++ projects/nfsv42/sys/amd64/linux32/linux32_sysvec.c Thu Dec 12 22:36:47 2019 (r355675) @@ -187,11 +187,10 @@ linux_translate_traps(int signal, int trap_code) } static int -linux_copyout_auxargs(struct image_params *imgp, u_long *base) +linux_copyout_auxargs(struct image_params *imgp, uintptr_t base) { Elf32_Auxargs *args; Elf32_Auxinfo *argarray, *pos; - u_long auxlen; int error, issetugid; args = (Elf32_Auxargs *)imgp->auxargs; @@ -238,9 +237,8 @@ linux_copyout_auxargs(struct image_params *imgp, u_lon imgp->auxargs = NULL; KASSERT(pos - argarray <= LINUX_AT_COUNT, ("Too many auxargs")); - auxlen = sizeof(*argarray) * (pos - argarray); - *base -= auxlen; - error = copyout(argarray, (void *)*base, auxlen); + error = copyout(argarray, (void *)base, + sizeof(*argarray) * LINUX_AT_COUNT); free(argarray, M_TEMP); return (error); } @@ -743,7 +741,7 @@ linux_copyout_strings(struct image_params *imgp, uintp if (execpath_len != 0) { destp -= execpath_len; - destp = rounddown2(destp, sizeof(void *)); + destp = rounddown2(destp, sizeof(uint32_t)); imgp->execpathp = destp; error = copyout(imgp->execpath, (void *)destp, execpath_len); if (error != 0) @@ -752,7 +750,7 @@ linux_copyout_strings(struct image_params *imgp, uintp /* Prepare the canary for SSP. */ arc4rand(canary, sizeof(canary), 0); - destp -= roundup(sizeof(canary), sizeof(void *)); + destp -= roundup(sizeof(canary), sizeof(uint32_t)); imgp->canary = destp; error = copyout(canary, (void *)destp, sizeof(canary)); if (error != 0) @@ -760,13 +758,16 @@ linux_copyout_strings(struct image_params *imgp, uintp /* Allocate room for the argument and environment strings. */ destp -= ARG_MAX - imgp->args->stringspace; - destp = rounddown2(destp, sizeof(void *)); + destp = rounddown2(destp, sizeof(uint32_t)); ustringp = destp; if (imgp->auxargs) { - error = imgp->sysent->sv_copyout_auxargs(imgp, &destp); - if (error != 0) - return (error); + /* + * Allocate room on the stack for the ELF auxargs + * array. It has LINUX_AT_COUNT entries. + */ + destp -= LINUX_AT_COUNT * sizeof(Elf32_Auxinfo); + destp = rounddown2(destp, sizeof(uint32_t)); } vectp = (uint32_t *)destp; @@ -824,6 +825,14 @@ linux_copyout_strings(struct image_params *imgp, uintp /* The end of the vector table is a null pointer. */ if (suword32(vectp, 0) != 0) return (EFAULT); + + if (imgp->auxargs) { + vectp++; + error = imgp->sysent->sv_copyout_auxargs(imgp, + (uintptr_t)vectp); + if (error != 0) + return (error); + } return (0); } Modified: projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c ============================================================================== --- projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c Thu Dec 12 22:00:10 2019 (r355674) +++ projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c Thu Dec 12 22:36:47 2019 (r355675) @@ -67,7 +67,7 @@ struct bcm283x_memory_mapping { vm_paddr_t vcbus_start; }; -#if defined(SOC_BCM2835) || defined(SOC_BCM2836) +#ifdef SOC_BCM2835 static struct bcm283x_memory_mapping bcm2835_memmap[] = { { /* SDRAM */ @@ -85,6 +85,24 @@ static struct bcm283x_memory_mapping bcm2835_memmap[] }; #endif +#ifdef SOC_BCM2836 +static struct bcm283x_memory_mapping bcm2836_memmap[] = { + { + /* SDRAM */ + .armc_start = 0x00000000, + .armc_size = BCM2836_ARM_IO_BASE, + .vcbus_start = BCM2836_VCBUS_SDRAM_BASE, + }, + { + /* Peripherals */ + .armc_start = BCM2836_ARM_IO_BASE, + .armc_size = BCM28XX_ARM_IO_SIZE, + .vcbus_start = BCM2836_VCBUS_IO_BASE, + }, + { 0, 0, 0 }, +}; +#endif + #ifdef SOC_BRCM_BCM2837 static struct bcm283x_memory_mapping bcm2837_memmap[] = { { @@ -142,7 +160,7 @@ static struct bcm283x_memory_soc_cfg { #endif #ifdef SOC_BCM2836 { - .memmap = bcm2835_memmap, + .memmap = bcm2836_memmap, .soc_compat = "brcm,bcm2836", .busdma_lowaddr = BUS_SPACE_MAXADDR_32BIT, }, Modified: projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h ============================================================================== --- projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h Thu Dec 12 22:00:10 2019 (r355674) +++ projects/nfsv42/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h Thu Dec 12 22:36:47 2019 (r355675) @@ -42,7 +42,11 @@ #define BCM2835_VCBUS_IO_BASE 0x7E000000 #define BCM2835_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_CACHED -#define BCM2837_ARM_IO_BASE 0x3f000000 +#define BCM2836_ARM_IO_BASE 0x3f000000 +#define BCM2836_VCBUS_IO_BASE BCM2835_VCBUS_IO_BASE +#define BCM2836_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_UNCACHED + +#define BCM2837_ARM_IO_BASE BCM2836_ARM_IO_BASE #define BCM2837_VCBUS_IO_BASE BCM2835_VCBUS_IO_BASE #define BCM2837_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_UNCACHED Modified: projects/nfsv42/sys/arm/include/pmap.h ============================================================================== --- projects/nfsv42/sys/arm/include/pmap.h Thu Dec 12 22:00:10 2019 (r355674) +++ projects/nfsv42/sys/arm/include/pmap.h Thu Dec 12 22:36:47 2019 (r355675) @@ -47,7 +47,7 @@ extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; void *pmap_kenter_temporary(vm_paddr_t, int); -#define pmap_page_is_write_mapped(m) (((m)->aflags & PGA_WRITEABLE) != 0) +#define pmap_page_is_write_mapped(m) (((m)->a.flags & PGA_WRITEABLE) != 0) void pmap_page_set_memattr(vm_page_t, vm_memattr_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); Copied: projects/nfsv42/sys/arm/linux/Makefile (from r355674, head/sys/arm/linux/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/nfsv42/sys/arm/linux/Makefile Thu Dec 12 22:36:47 2019 (r355675, copy of r355674, head/sys/arm/linux/Makefile) @@ -0,0 +1,25 @@ +# Makefile for syscall tables +# +# $FreeBSD$ + +# Don't use an OBJDIR +.OBJDIR: ${.CURDIR} + +.include + +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: ${GENERATED} + +${GENERATED}: ${MAKESYSCALLS} ${SRCS} + ${LUA} ${MAKESYSCALLS} syscalls.master syscalls.conf Copied: projects/nfsv42/sys/arm/linux/linux_proto.h (from r355674, head/sys/arm/linux/linux_proto.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/nfsv42/sys/arm/linux/linux_proto.h Thu Dec 12 22:36:47 2019 (r355675, copy of r355674, head/sys/arm/linux/linux_proto.h) @@ -0,0 +1,1826 @@ +/* + * System call prototypes. + * + * DO NOT EDIT-- this file is automatically @generated. + * $FreeBSD$ + */ + +#ifndef _LINUX_SYSPROTO_H_ +#define _LINUX_SYSPROTO_H_ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +struct proc; + +struct thread; + +#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \ + 0 : sizeof(register_t) - sizeof(t)) + +#if BYTE_ORDER == LITTLE_ENDIAN +#define PADL_(t) 0 +#define PADR_(t) PAD_(t) +#else +#define PADL_(t) PAD_(t) +#define PADR_(t) 0 +#endif + +#define nosys linux_nosys +struct linux_exit_args { + char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)]; +}; +struct linux_fork_args { + register_t dummy; +}; +struct linux_open_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; +}; +struct linux_creat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; +}; +struct linux_link_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; +}; +struct linux_unlink_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; +}; +struct linux_execve_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)]; + char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)]; +}; +struct linux_chdir_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; +}; +struct linux_mknod_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; + char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)]; +}; +struct linux_chmod_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)]; +}; +struct linux_lchown16_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; + char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; +}; +struct linux_lseek_args { + char fdes_l_[PADL_(l_uint)]; l_uint fdes; char fdes_r_[PADR_(l_uint)]; + char off_l_[PADL_(l_off_t)]; l_off_t off; char off_r_[PADR_(l_off_t)]; + char whence_l_[PADL_(l_int)]; l_int whence; char whence_r_[PADR_(l_int)]; +}; +struct linux_getpid_args { + register_t dummy; +}; +struct linux_mount_args { + char specialfile_l_[PADL_(char *)]; char * specialfile; char specialfile_r_[PADR_(char *)]; + char dir_l_[PADL_(char *)]; char * dir; char dir_r_[PADR_(char *)]; + char filesystemtype_l_[PADL_(char *)]; char * filesystemtype; char filesystemtype_r_[PADR_(char *)]; + char rwflag_l_[PADL_(l_ulong)]; l_ulong rwflag; char rwflag_r_[PADR_(l_ulong)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; +}; +struct linux_setuid16_args { + char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; +}; +struct linux_getuid16_args { + register_t dummy; +}; +struct linux_pause_args { + register_t dummy; +}; +struct linux_access_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char amode_l_[PADL_(l_int)]; l_int amode; char amode_r_[PADR_(l_int)]; +}; +struct linux_nice_args { + char inc_l_[PADL_(l_int)]; l_int inc; char inc_r_[PADR_(l_int)]; +}; +struct linux_kill_args { + char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)]; + char signum_l_[PADL_(l_int)]; l_int signum; char signum_r_[PADR_(l_int)]; +}; +struct linux_rename_args { + char from_l_[PADL_(char *)]; char * from; char from_r_[PADR_(char *)]; + char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; +}; +struct linux_mkdir_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; +}; +struct linux_rmdir_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; +}; +struct linux_pipe_args { + char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char pipefds_r_[PADR_(l_int *)]; +}; +struct linux_times_args { + char buf_l_[PADL_(struct l_times_argv *)]; struct l_times_argv * buf; char buf_r_[PADR_(struct l_times_argv *)]; +}; +struct linux_brk_args { + char dsend_l_[PADL_(l_ulong)]; l_ulong dsend; char dsend_r_[PADR_(l_ulong)]; +}; +struct linux_setgid16_args { + char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; +}; +struct linux_getgid16_args { + register_t dummy; +}; +struct linux_geteuid16_args { + register_t dummy; +}; +struct linux_getegid16_args { + register_t dummy; +}; +struct linux_umount_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; +}; +struct linux_ioctl_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; + char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)]; +}; +struct linux_fcntl_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; + char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)]; +}; +struct linux_ustat_args { + char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)]; + char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)]; +}; +struct linux_getppid_args { + register_t dummy; +}; +struct linux_sigaction_args { + char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; + char nsa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * nsa; char nsa_r_[PADR_(l_osigaction_t *)]; + char osa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * osa; char osa_r_[PADR_(l_osigaction_t *)]; +}; +struct linux_setreuid16_args { + char ruid_l_[PADL_(l_uid16_t)]; l_uid16_t ruid; char ruid_r_[PADR_(l_uid16_t)]; + char euid_l_[PADL_(l_uid16_t)]; l_uid16_t euid; char euid_r_[PADR_(l_uid16_t)]; +}; +struct linux_setregid16_args { + char rgid_l_[PADL_(l_gid16_t)]; l_gid16_t rgid; char rgid_r_[PADR_(l_gid16_t)]; + char egid_l_[PADL_(l_gid16_t)]; l_gid16_t egid; char egid_r_[PADR_(l_gid16_t)]; +}; +struct linux_sigsuspend_args { + char hist0_l_[PADL_(l_int)]; l_int hist0; char hist0_r_[PADR_(l_int)]; + char hist1_l_[PADL_(l_int)]; l_int hist1; char hist1_r_[PADR_(l_int)]; + char mask_l_[PADL_(l_osigset_t)]; l_osigset_t mask; char mask_r_[PADR_(l_osigset_t)]; +}; +struct linux_sigpending_args { + char mask_l_[PADL_(l_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)]; +}; +struct linux_sethostname_args { + char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)]; + char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)]; +}; +struct linux_setrlimit_args { + char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)]; + char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)]; +}; +struct linux_gettimeofday_args { + char tp_l_[PADL_(struct timeval32 *)]; struct timeval32 * tp; char tp_r_[PADR_(struct timeval32 *)]; + char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)]; +}; +struct linux_settimeofday_args { + char tp_l_[PADL_(struct timeval32 *)]; struct timeval32 * tp; char tp_r_[PADR_(struct timeval32 *)]; + char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)]; +}; +struct linux_getgroups16_args { + char gidsetsize_l_[PADL_(l_uint)]; l_uint gidsetsize; char gidsetsize_r_[PADR_(l_uint)]; + char gidset_l_[PADL_(l_gid16_t *)]; l_gid16_t * gidset; char gidset_r_[PADR_(l_gid16_t *)]; +}; +struct linux_setgroups16_args { + char gidsetsize_l_[PADL_(l_uint)]; l_uint gidsetsize; char gidsetsize_r_[PADR_(l_uint)]; + char gidset_l_[PADL_(l_gid16_t *)]; l_gid16_t * gidset; char gidset_r_[PADR_(l_gid16_t *)]; +}; +struct linux_symlink_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; +}; +struct linux_readlink_args { + char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char count_l_[PADL_(l_int)]; l_int count; char count_r_[PADR_(l_int)]; +}; +struct linux_reboot_args { + char magic1_l_[PADL_(l_int)]; l_int magic1; char magic1_r_[PADR_(l_int)]; + char magic2_l_[PADL_(l_int)]; l_int magic2; char magic2_r_[PADR_(l_int)]; + char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; + char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)]; +}; +struct linux_truncate_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)]; +}; +struct linux_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)]; +}; +struct linux_getpriority_args { + char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; + char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; +}; +struct linux_statfs_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct l_statfs_buf *)]; struct l_statfs_buf * buf; char buf_r_[PADR_(struct l_statfs_buf *)]; +}; +struct linux_fstatfs_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char buf_l_[PADL_(struct l_statfs_buf *)]; struct l_statfs_buf * buf; char buf_r_[PADR_(struct l_statfs_buf *)]; +}; +struct linux_syslog_args { + char type_l_[PADL_(l_int)]; l_int type; char type_r_[PADR_(l_int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char len_l_[PADL_(l_int)]; l_int len; char len_r_[PADR_(l_int)]; +}; +struct linux_setitimer_args { + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char itv_l_[PADL_(struct l_itimerval *)]; struct l_itimerval * itv; char itv_r_[PADR_(struct l_itimerval *)]; + char oitv_l_[PADL_(struct l_itimerval *)]; struct l_itimerval * oitv; char oitv_r_[PADR_(struct l_itimerval *)]; +}; +struct linux_getitimer_args { + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char itv_l_[PADL_(struct l_itimerval *)]; struct l_itimerval * itv; char itv_r_[PADR_(struct l_itimerval *)]; +}; +struct linux_newstat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct l_newstat *)]; struct l_newstat * buf; char buf_r_[PADR_(struct l_newstat *)]; +}; +struct linux_newlstat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct l_newstat *)]; struct l_newstat * buf; char buf_r_[PADR_(struct l_newstat *)]; +}; +struct linux_newfstat_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char buf_l_[PADL_(struct l_newstat *)]; struct l_newstat * buf; char buf_r_[PADR_(struct l_newstat *)]; +}; +struct linux_vhangup_args { + register_t dummy; +}; +struct linux_wait4_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char status_l_[PADL_(l_int *)]; l_int * status; char status_r_[PADR_(l_int *)]; + char options_l_[PADL_(l_int)]; l_int options; char options_r_[PADR_(l_int)]; + char rusage_l_[PADL_(void *)]; void * rusage; char rusage_r_[PADR_(void *)]; +}; +struct linux_swapoff_args { + register_t dummy; +}; +struct linux_sysinfo_args { + char info_l_[PADL_(struct l_sysinfo *)]; struct l_sysinfo * info; char info_r_[PADR_(struct l_sysinfo *)]; +}; +struct linux_sigreturn_args { + char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char sfp_r_[PADR_(struct l_sigframe *)]; +}; +struct linux_clone_args { + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void *)]; + char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char parent_tidptr_r_[PADR_(void *)]; + char tls_l_[PADL_(void *)]; void * tls; char tls_r_[PADR_(void *)]; + char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; +}; +struct linux_setdomainname_args { + char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)]; + char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; +}; +struct linux_newuname_args { + char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)]; +}; +struct linux_adjtimex_args { + register_t dummy; +}; +struct linux_mprotect_args { + char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; + char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; +}; +struct linux_sigprocmask_args { + char how_l_[PADL_(l_int)]; l_int how; char how_r_[PADR_(l_int)]; + char mask_l_[PADL_(l_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)]; + char omask_l_[PADL_(l_osigset_t *)]; l_osigset_t * omask; char omask_r_[PADR_(l_osigset_t *)]; +}; +struct linux_init_module_args { + register_t dummy; +}; +struct linux_delete_module_args { + register_t dummy; +}; +struct linux_quotactl_args { + register_t dummy; +}; +struct linux_bdflush_args { + register_t dummy; +}; +struct linux_sysfs_args { + char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; + char arg1_l_[PADL_(l_ulong)]; l_ulong arg1; char arg1_r_[PADR_(l_ulong)]; + char arg2_l_[PADL_(l_ulong)]; l_ulong arg2; char arg2_r_[PADR_(l_ulong)]; +}; +struct linux_personality_args { + char per_l_[PADL_(l_ulong)]; l_ulong per; char per_r_[PADR_(l_ulong)]; +}; +struct linux_setfsuid16_args { + char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; +}; +struct linux_setfsgid16_args { + char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; +}; +struct linux_llseek_args { + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char ohigh_l_[PADL_(l_ulong)]; l_ulong ohigh; char ohigh_r_[PADR_(l_ulong)]; + char olow_l_[PADL_(l_ulong)]; l_ulong olow; char olow_r_[PADR_(l_ulong)]; + char res_l_[PADL_(l_loff_t *)]; l_loff_t * res; char res_r_[PADR_(l_loff_t *)]; + char whence_l_[PADL_(l_uint)]; l_uint whence; char whence_r_[PADR_(l_uint)]; +}; +struct linux_getdents_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char dent_l_[PADL_(void *)]; void * dent; char dent_r_[PADR_(void *)]; + char count_l_[PADL_(l_uint)]; l_uint count; char count_r_[PADR_(l_uint)]; +}; +struct linux_select_args { + char nfds_l_[PADL_(l_int)]; l_int nfds; char nfds_r_[PADR_(l_int)]; + char readfds_l_[PADL_(l_fd_set *)]; l_fd_set * readfds; char readfds_r_[PADR_(l_fd_set *)]; + char writefds_l_[PADL_(l_fd_set *)]; l_fd_set * writefds; char writefds_r_[PADR_(l_fd_set *)]; + char exceptfds_l_[PADL_(l_fd_set *)]; l_fd_set * exceptfds; char exceptfds_r_[PADR_(l_fd_set *)]; + char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; +}; +struct linux_msync_args { + char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; + char fl_l_[PADL_(l_int)]; l_int fl; char fl_r_[PADR_(l_int)]; +}; +struct linux_getsid_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; +}; +struct linux_fdatasync_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; +}; +struct linux_sysctl_args { + char args_l_[PADL_(struct l___sysctl_args *)]; struct l___sysctl_args * args; char args_r_[PADR_(struct l___sysctl_args *)]; +}; +struct linux_sched_setparam_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char param_l_[PADL_(struct sched_param *)]; struct sched_param * param; char param_r_[PADR_(struct sched_param *)]; +}; +struct linux_sched_getparam_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char param_l_[PADL_(struct sched_param *)]; struct sched_param * param; char param_r_[PADR_(struct sched_param *)]; +}; +struct linux_sched_setscheduler_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char policy_l_[PADL_(l_int)]; l_int policy; char policy_r_[PADR_(l_int)]; + char param_l_[PADL_(struct sched_param *)]; struct sched_param * param; char param_r_[PADR_(struct sched_param *)]; +}; +struct linux_sched_getscheduler_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; +}; +struct linux_sched_get_priority_max_args { + char policy_l_[PADL_(l_int)]; l_int policy; char policy_r_[PADR_(l_int)]; +}; +struct linux_sched_get_priority_min_args { + char policy_l_[PADL_(l_int)]; l_int policy; char policy_r_[PADR_(l_int)]; +}; +struct linux_sched_rr_get_interval_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char interval_l_[PADL_(struct l_timespec *)]; struct l_timespec * interval; char interval_r_[PADR_(struct l_timespec *)]; +}; +struct linux_nanosleep_args { + char rqtp_l_[PADL_(const struct l_timespec *)]; const struct l_timespec * rqtp; char rqtp_r_[PADR_(const struct l_timespec *)]; + char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp; char rmtp_r_[PADR_(struct l_timespec *)]; +}; +struct linux_mremap_args { + char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)]; + char old_len_l_[PADL_(l_ulong)]; l_ulong old_len; char old_len_r_[PADR_(l_ulong)]; + char new_len_l_[PADL_(l_ulong)]; l_ulong new_len; char new_len_r_[PADR_(l_ulong)]; + char flags_l_[PADL_(l_ulong)]; l_ulong flags; char flags_r_[PADR_(l_ulong)]; + char new_addr_l_[PADL_(l_ulong)]; l_ulong new_addr; char new_addr_r_[PADR_(l_ulong)]; +}; +struct linux_setresuid16_args { + char ruid_l_[PADL_(l_uid16_t)]; l_uid16_t ruid; char ruid_r_[PADR_(l_uid16_t)]; + char euid_l_[PADL_(l_uid16_t)]; l_uid16_t euid; char euid_r_[PADR_(l_uid16_t)]; + char suid_l_[PADL_(l_uid16_t)]; l_uid16_t suid; char suid_r_[PADR_(l_uid16_t)]; +}; +struct linux_getresuid16_args { + char ruid_l_[PADL_(l_uid16_t *)]; l_uid16_t * ruid; char ruid_r_[PADR_(l_uid16_t *)]; + char euid_l_[PADL_(l_uid16_t *)]; l_uid16_t * euid; char euid_r_[PADR_(l_uid16_t *)]; + char suid_l_[PADL_(l_uid16_t *)]; l_uid16_t * suid; char suid_r_[PADR_(l_uid16_t *)]; +}; +struct linux_setresgid16_args { + char rgid_l_[PADL_(l_gid16_t)]; l_gid16_t rgid; char rgid_r_[PADR_(l_gid16_t)]; + char egid_l_[PADL_(l_gid16_t)]; l_gid16_t egid; char egid_r_[PADR_(l_gid16_t)]; + char sgid_l_[PADL_(l_gid16_t)]; l_gid16_t sgid; char sgid_r_[PADR_(l_gid16_t)]; +}; +struct linux_getresgid16_args { + char rgid_l_[PADL_(l_gid16_t *)]; l_gid16_t * rgid; char rgid_r_[PADR_(l_gid16_t *)]; + char egid_l_[PADL_(l_gid16_t *)]; l_gid16_t * egid; char egid_r_[PADR_(l_gid16_t *)]; + char sgid_l_[PADL_(l_gid16_t *)]; l_gid16_t * sgid; char sgid_r_[PADR_(l_gid16_t *)]; +}; +struct linux_prctl_args { + char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; + char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; + char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)]; + char arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)]; + char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; +}; +struct linux_rt_sigreturn_args { + char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; +}; +struct linux_rt_sigaction_args { + char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; + char act_l_[PADL_(l_sigaction_t *)]; l_sigaction_t * act; char act_r_[PADR_(l_sigaction_t *)]; + char oact_l_[PADL_(l_sigaction_t *)]; l_sigaction_t * oact; char oact_r_[PADR_(l_sigaction_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; +}; +struct linux_rt_sigprocmask_args { + char how_l_[PADL_(l_int)]; l_int how; char how_r_[PADR_(l_int)]; + char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; + char omask_l_[PADL_(l_sigset_t *)]; l_sigset_t * omask; char omask_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; +}; +struct linux_rt_sigpending_args { + char set_l_[PADL_(l_sigset_t *)]; l_sigset_t * set; char set_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; +}; +struct linux_rt_sigtimedwait_args { + char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; + char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; + char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; +}; +struct linux_rt_sigqueueinfo_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; + char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)]; +}; +struct linux_rt_sigsuspend_args { + char newset_l_[PADL_(l_sigset_t *)]; l_sigset_t * newset; char newset_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; +}; +struct linux_pread_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; + char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)]; +}; +struct linux_pwrite_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; + char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)]; +}; +struct linux_chown16_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; + char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; +}; +struct linux_getcwd_args { + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char bufsize_l_[PADL_(l_ulong)]; l_ulong bufsize; char bufsize_r_[PADR_(l_ulong)]; +}; +struct linux_capget_args { + char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)]; + char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)]; +}; +struct linux_capset_args { + char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)]; + char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)]; +}; +struct linux_sigaltstack_args { + char uss_l_[PADL_(l_stack_t *)]; l_stack_t * uss; char uss_r_[PADR_(l_stack_t *)]; + char uoss_l_[PADL_(l_stack_t *)]; l_stack_t * uoss; char uoss_r_[PADR_(l_stack_t *)]; +}; +struct linux_sendfile_args { + register_t dummy; +}; +struct linux_vfork_args { + register_t dummy; +}; +struct linux_getrlimit_args { + char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)]; + char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)]; +}; +struct linux_mmap2_args { + char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)]; + char len_l_[PADL_(l_ulong)]; l_ulong len; char len_r_[PADR_(l_ulong)]; + char prot_l_[PADL_(l_ulong)]; l_ulong prot; char prot_r_[PADR_(l_ulong)]; + char flags_l_[PADL_(l_ulong)]; l_ulong flags; char flags_r_[PADR_(l_ulong)]; + char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)]; + char pgoff_l_[PADL_(l_ulong)]; l_ulong pgoff; char pgoff_r_[PADR_(l_ulong)]; +}; +struct linux_truncate64_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char length_l_[PADL_(l_loff_t)]; l_loff_t length; char length_r_[PADR_(l_loff_t)]; +}; +struct linux_ftruncate64_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char length_l_[PADL_(l_loff_t)]; l_loff_t length; char length_r_[PADR_(l_loff_t)]; +}; +struct linux_stat64_args { + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; + char statbuf_l_[PADL_(struct l_stat64 *)]; struct l_stat64 * statbuf; char statbuf_r_[PADR_(struct l_stat64 *)]; +}; +struct linux_lstat64_args { + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; + char statbuf_l_[PADL_(struct l_stat64 *)]; struct l_stat64 * statbuf; char statbuf_r_[PADR_(struct l_stat64 *)]; +}; +struct linux_fstat64_args { + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char statbuf_l_[PADL_(struct l_stat64 *)]; struct l_stat64 * statbuf; char statbuf_r_[PADR_(struct l_stat64 *)]; +}; +struct linux_lchown_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char uid_l_[PADL_(l_uid_t)]; l_uid_t uid; char uid_r_[PADR_(l_uid_t)]; + char gid_l_[PADL_(l_gid_t)]; l_gid_t gid; char gid_r_[PADR_(l_gid_t)]; +}; +struct linux_getuid_args { + register_t dummy; +}; +struct linux_getgid_args { + register_t dummy; +}; +struct linux_getgroups_args { + char gidsetsize_l_[PADL_(l_int)]; l_int gidsetsize; char gidsetsize_r_[PADR_(l_int)]; + char grouplist_l_[PADL_(l_gid_t *)]; l_gid_t * grouplist; char grouplist_r_[PADR_(l_gid_t *)]; +}; +struct linux_setgroups_args { + char gidsetsize_l_[PADL_(l_int)]; l_int gidsetsize; char gidsetsize_r_[PADR_(l_int)]; + char grouplist_l_[PADL_(l_gid_t *)]; l_gid_t * grouplist; char grouplist_r_[PADR_(l_gid_t *)]; +}; +struct linux_chown_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char uid_l_[PADL_(l_uid_t)]; l_uid_t uid; char uid_r_[PADR_(l_uid_t)]; + char gid_l_[PADL_(l_gid_t)]; l_gid_t gid; char gid_r_[PADR_(l_gid_t)]; +}; +struct linux_setfsuid_args { + char uid_l_[PADL_(l_uid_t)]; l_uid_t uid; char uid_r_[PADR_(l_uid_t)]; +}; +struct linux_setfsgid_args { + char gid_l_[PADL_(l_gid_t)]; l_gid_t gid; char gid_r_[PADR_(l_gid_t)]; +}; +struct linux_getdents64_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char dirent_l_[PADL_(void *)]; void * dirent; char dirent_r_[PADR_(void *)]; + char count_l_[PADL_(l_uint)]; l_uint count; char count_r_[PADR_(l_uint)]; +}; +struct linux_pivot_root_args { + char new_root_l_[PADL_(char *)]; char * new_root; char new_root_r_[PADR_(char *)]; + char put_old_l_[PADL_(char *)]; char * put_old; char put_old_r_[PADR_(char *)]; +}; +struct linux_mincore_args { + char start_l_[PADL_(l_ulong)]; l_ulong start; char start_r_[PADR_(l_ulong)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; + char vec_l_[PADL_(u_char *)]; u_char * vec; char vec_r_[PADR_(u_char *)]; +}; +struct linux_fcntl64_args { + char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; + char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; + char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)]; +}; +struct linux_gettid_args { + register_t dummy; +}; +struct linux_setxattr_args { + register_t dummy; +}; +struct linux_lsetxattr_args { + register_t dummy; +}; +struct linux_fsetxattr_args { + register_t dummy; +}; +struct linux_getxattr_args { + register_t dummy; +}; +struct linux_lgetxattr_args { + register_t dummy; +}; +struct linux_fgetxattr_args { + register_t dummy; +}; +struct linux_listxattr_args { + register_t dummy; +}; +struct linux_llistxattr_args { + register_t dummy; +}; +struct linux_flistxattr_args { + register_t dummy; +}; +struct linux_removexattr_args { + register_t dummy; +}; +struct linux_lremovexattr_args { + register_t dummy; +}; +struct linux_fremovexattr_args { + register_t dummy; +}; +struct linux_tkill_args { + char tid_l_[PADL_(int)]; int tid; char tid_r_[PADR_(int)]; + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; +}; +struct linux_sys_futex_args { + char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; + char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)]; + char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)]; +}; +struct linux_sched_setaffinity_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)]; + char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)]; +}; +struct linux_sched_getaffinity_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)]; + char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)]; +}; +struct linux_exit_group_args { + char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)]; +}; +struct linux_lookup_dcookie_args { + register_t dummy; +}; +struct linux_epoll_create_args { + char size_l_[PADL_(l_int)]; l_int size; char size_r_[PADR_(l_int)]; +}; +struct linux_epoll_ctl_args { + char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char event_l_[PADL_(struct epoll_event *)]; struct epoll_event * event; char event_r_[PADR_(struct epoll_event *)]; +}; +struct linux_epoll_wait_args { + char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; + char events_l_[PADL_(struct epoll_event *)]; struct epoll_event * events; char events_r_[PADR_(struct epoll_event *)]; + char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; + char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; +}; +struct linux_remap_file_pages_args { + register_t dummy; +}; +struct linux_set_tid_address_args { + char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)]; +}; +struct linux_timer_create_args { + char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; + char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)]; + char timerid_l_[PADL_(l_timer_t *)]; l_timer_t * timerid; char timerid_r_[PADR_(l_timer_t *)]; +}; +struct linux_timer_settime_args { + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new; char new_r_[PADR_(const struct itimerspec *)]; + char old_l_[PADL_(struct itimerspec *)]; struct itimerspec * old; char old_r_[PADR_(struct itimerspec *)]; +}; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***