From owner-svn-src-projects@freebsd.org Sat Jul 29 20:19:41 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4663CDCA5BB for ; Sat, 29 Jul 2017 20:19:41 +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 mx1.freebsd.org (Postfix) with ESMTPS id CDE2476FF0; Sat, 29 Jul 2017 20:19:40 +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 v6TKJehe040046; Sat, 29 Jul 2017 20:19:40 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6TKJcZC040026; Sat, 29 Jul 2017 20:19:38 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201707292019.v6TKJcZC040026@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 29 Jul 2017 20:19:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321690 - in projects/pnfs-planb-server/sys: amd64/amd64 amd64/include arm/allwinner/clkng arm/arm arm/freescale/imx arm/include arm/mv arm64/arm64 boot/efi/libefi cam/ata cddl/contrib/... X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/pnfs-planb-server/sys: amd64/amd64 amd64/include arm/allwinner/clkng arm/arm arm/freescale/imx arm/include arm/mv arm64/arm64 boot/efi/libefi cam/ata cddl/contrib/opensolaris/uts/common/fs... X-SVN-Commit-Revision: 321690 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.23 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: Sat, 29 Jul 2017 20:19:41 -0000 Author: rmacklem Date: Sat Jul 29 20:19:37 2017 New Revision: 321690 URL: https://svnweb.freebsd.org/changeset/base/321690 Log: Update to a current head kernel. Added: projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslparseop.c - copied unchanged from r321689, head/sys/contrib/dev/acpica/compiler/aslparseop.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c - copied unchanged from r321689, head/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c Deleted: projects/pnfs-planb-server/sys/net/flowtable.c projects/pnfs-planb-server/sys/net/flowtable.h Modified: projects/pnfs-planb-server/sys/amd64/amd64/pmap.c projects/pnfs-planb-server/sys/amd64/include/pmap.h projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_a64.c projects/pnfs-planb-server/sys/arm/arm/mpcore_timer.c projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c projects/pnfs-planb-server/sys/arm/freescale/imx/imx_i2c.c projects/pnfs-planb-server/sys/arm/include/pte-v6.h projects/pnfs-planb-server/sys/arm/include/ucontext.h projects/pnfs-planb-server/sys/arm/mv/mv_machdep.c projects/pnfs-planb-server/sys/arm64/arm64/trap.c projects/pnfs-planb-server/sys/boot/efi/libefi/efinet.c projects/pnfs-planb-server/sys/cam/ata/ata_da.c projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_fd.c projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_mem.c projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_sock.c projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_util.h projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_proto.h projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_sock.c projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_syscall.h projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_syscalls.c projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_sysent.c projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_systrace_args.c projects/pnfs-planb-server/sys/compat/cloudabi64/cloudabi64_proto.h projects/pnfs-planb-server/sys/compat/cloudabi64/cloudabi64_sock.c projects/pnfs-planb-server/sys/compat/cloudabi64/cloudabi64_syscall.h projects/pnfs-planb-server/sys/compat/cloudabi64/cloudabi64_syscalls.c projects/pnfs-planb-server/sys/compat/cloudabi64/cloudabi64_sysent.c projects/pnfs-planb-server/sys/compat/cloudabi64/cloudabi64_systrace_args.c projects/pnfs-planb-server/sys/compat/linux/linux_ioctl.h projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/compiler.h projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_hrtimer.c projects/pnfs-planb-server/sys/conf/NOTES projects/pnfs-planb-server/sys/conf/files projects/pnfs-planb-server/sys/conf/kern.post.mk projects/pnfs-planb-server/sys/conf/options projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi32_types.h projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi64_types.h projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi_types_common.h projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi_vdso_armv6.S projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi_vdso_i686.S projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S projects/pnfs-planb-server/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S projects/pnfs-planb-server/sys/contrib/cloudabi/syscalls32.master projects/pnfs-planb-server/sys/contrib/cloudabi/syscalls64.master projects/pnfs-planb-server/sys/contrib/dev/acpica/acpica_prep.sh projects/pnfs-planb-server/sys/contrib/dev/acpica/changes.txt projects/pnfs-planb-server/sys/contrib/dev/acpica/common/acfileio.c projects/pnfs-planb-server/sys/contrib/dev/acpica/common/adisasm.c projects/pnfs-planb-server/sys/contrib/dev/acpica/common/adwalk.c projects/pnfs-planb-server/sys/contrib/dev/acpica/common/ahpredef.c projects/pnfs-planb-server/sys/contrib/dev/acpica/common/ahtable.c projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtable.c projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtbinfo.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompile.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcstyle.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asldefine.h projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslerror.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslexternal.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslfold.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslglobal.h projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslhelp.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslhelpers.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslkeywords.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asllength.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asllisting.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslload.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asllookup.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmap.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmessages.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmessages.h projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmethod.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asloffset.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslopt.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asloptions.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslpld.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslpredef.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslprimaries.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslprintf.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslresource.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslresources.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslrules.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslstartup.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslsupport.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltokens.y projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltransform.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltree.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltypes.h projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslutils.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslwalks.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslxref.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvcompiler.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvdisasm.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvparser.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtcompile.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttemplate.h projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtutils.c projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/prmacros.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/excreate.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/exdump.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/exmisc.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/parser/psloop.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/parser/psobject.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/resources/rsxface.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/tables/tbdata.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/tables/tbutils.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/tables/tbxface.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/uthex.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utmath.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utobject.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utstate.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acapps.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acdisasm.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acdispat.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/aclocal.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acnames.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acobject.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acpi.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acpixf.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actables.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actbl.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actbl2.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actypes.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acutils.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/platform/acenv.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/pnfs-planb-server/sys/contrib/dev/acpica/include/platform/acgcc.h projects/pnfs-planb-server/sys/dev/acpica/acpi.c projects/pnfs-planb-server/sys/dev/bnxt/bnxt.h projects/pnfs-planb-server/sys/dev/bnxt/bnxt_hwrm.c projects/pnfs-planb-server/sys/dev/bnxt/bnxt_hwrm.h projects/pnfs-planb-server/sys/dev/bnxt/bnxt_sysctl.c projects/pnfs-planb-server/sys/dev/bnxt/if_bnxt.c projects/pnfs-planb-server/sys/dev/cxgbe/common/common.h projects/pnfs-planb-server/sys/dev/cxgbe/common/t4_hw.c projects/pnfs-planb-server/sys/dev/cxgbe/iw_cxgbe/cm.c projects/pnfs-planb-server/sys/dev/cxgbe/t4_main.c projects/pnfs-planb-server/sys/dev/cxgbe/t4_sge.c projects/pnfs-planb-server/sys/dev/etherswitch/e6000sw/e6000sw.c projects/pnfs-planb-server/sys/dev/etherswitch/e6000sw/e6000swreg.h projects/pnfs-planb-server/sys/dev/evdev/cdev.c projects/pnfs-planb-server/sys/dev/evdev/evdev.c projects/pnfs-planb-server/sys/dev/evdev/evdev_mt.c projects/pnfs-planb-server/sys/dev/evdev/evdev_private.h projects/pnfs-planb-server/sys/dev/evdev/evdev_utils.c projects/pnfs-planb-server/sys/dev/evdev/input-event-codes.h projects/pnfs-planb-server/sys/dev/evdev/input.h projects/pnfs-planb-server/sys/dev/evdev/uinput.c projects/pnfs-planb-server/sys/dev/evdev/uinput.h projects/pnfs-planb-server/sys/dev/hyperv/netvsc/if_hn.c projects/pnfs-planb-server/sys/dev/hyperv/netvsc/if_hnvar.h projects/pnfs-planb-server/sys/dev/iicbus/iicbus.h projects/pnfs-planb-server/sys/dev/iicbus/iiconf.c projects/pnfs-planb-server/sys/dev/iicbus/iiconf.h projects/pnfs-planb-server/sys/dev/isp/isp.c projects/pnfs-planb-server/sys/dev/iwm/if_iwm.c projects/pnfs-planb-server/sys/dev/iwm/if_iwm_scan.c projects/pnfs-planb-server/sys/dev/iwm/if_iwm_sta.c projects/pnfs-planb-server/sys/dev/iwm/if_iwm_util.c projects/pnfs-planb-server/sys/dev/iwm/if_iwm_util.h projects/pnfs-planb-server/sys/dev/iwm/if_iwmreg.h projects/pnfs-planb-server/sys/dev/iwm/if_iwmvar.h projects/pnfs-planb-server/sys/dev/ixgbe/ix_txrx.c projects/pnfs-planb-server/sys/dev/ixl/ixl_txrx.c projects/pnfs-planb-server/sys/dev/ksyms/ksyms.c projects/pnfs-planb-server/sys/dev/mmc/bridge.h projects/pnfs-planb-server/sys/dev/mmc/mmc.c projects/pnfs-planb-server/sys/dev/mmc/mmc_ioctl.h projects/pnfs-planb-server/sys/dev/mmc/mmc_private.h projects/pnfs-planb-server/sys/dev/mmc/mmc_subr.c projects/pnfs-planb-server/sys/dev/mmc/mmcbr_if.m projects/pnfs-planb-server/sys/dev/mmc/mmcbrvar.h projects/pnfs-planb-server/sys/dev/mmc/mmcbus_if.m projects/pnfs-planb-server/sys/dev/mmc/mmcreg.h projects/pnfs-planb-server/sys/dev/mmc/mmcsd.c projects/pnfs-planb-server/sys/dev/mpr/mpr_sas.c projects/pnfs-planb-server/sys/dev/ow/owc_gpiobus.c projects/pnfs-planb-server/sys/dev/sdhci/sdhci.c projects/pnfs-planb-server/sys/dev/sdhci/sdhci.h projects/pnfs-planb-server/sys/dev/sdhci/sdhci_acpi.c projects/pnfs-planb-server/sys/dev/sdhci/sdhci_if.m projects/pnfs-planb-server/sys/dev/sdhci/sdhci_pci.c projects/pnfs-planb-server/sys/dev/uart/uart_bus_pci.c projects/pnfs-planb-server/sys/dev/virtio/network/if_vtnetvar.h projects/pnfs-planb-server/sys/fs/fdescfs/fdesc.h projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c projects/pnfs-planb-server/sys/fs/nfs/nfs_commonsubs.c projects/pnfs-planb-server/sys/fs/nfs/nfscl.h projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clbio.c projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clport.c projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clstate.c projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clvfsops.c projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clvnops.c projects/pnfs-planb-server/sys/fs/nfsclient/nfsmount.h projects/pnfs-planb-server/sys/fs/smbfs/smbfs_io.c projects/pnfs-planb-server/sys/kern/kern_sig.c projects/pnfs-planb-server/sys/kern/subr_blist.c projects/pnfs-planb-server/sys/kern/subr_clock.c projects/pnfs-planb-server/sys/kern/subr_pctrie.c projects/pnfs-planb-server/sys/mips/conf/CARAMBOLA2.hints projects/pnfs-planb-server/sys/mips/conf/TL-WDR4300 projects/pnfs-planb-server/sys/mips/conf/std.AR933X projects/pnfs-planb-server/sys/net/ethernet.h projects/pnfs-planb-server/sys/net/if_ethersubr.c projects/pnfs-planb-server/sys/net/if_lagg.c projects/pnfs-planb-server/sys/net/if_stf.c projects/pnfs-planb-server/sys/net/iflib.c projects/pnfs-planb-server/sys/net/iflib.h projects/pnfs-planb-server/sys/net/rndis.h projects/pnfs-planb-server/sys/net/route.c projects/pnfs-planb-server/sys/net80211/ieee80211_amrr.c projects/pnfs-planb-server/sys/net80211/ieee80211_rssadapt.c projects/pnfs-planb-server/sys/netinet/cc/cc_cdg.c projects/pnfs-planb-server/sys/netinet/cc/cc_chd.c projects/pnfs-planb-server/sys/netinet/cc/cc_cubic.c projects/pnfs-planb-server/sys/netinet/cc/cc_dctcp.c projects/pnfs-planb-server/sys/netinet/cc/cc_htcp.c projects/pnfs-planb-server/sys/netinet/cc/cc_newreno.c projects/pnfs-planb-server/sys/netinet/ip_output.c projects/pnfs-planb-server/sys/netinet/sctp_indata.c projects/pnfs-planb-server/sys/netinet/tcp_input.c projects/pnfs-planb-server/sys/netinet/tcp_stacks/fastpath.c projects/pnfs-planb-server/sys/netinet6/ip6_output.c projects/pnfs-planb-server/sys/nfs/nfs_nfssvc.c projects/pnfs-planb-server/sys/nfs/nfssvc.h projects/pnfs-planb-server/sys/sys/ata.h projects/pnfs-planb-server/sys/sys/param.h projects/pnfs-planb-server/sys/sys/pctrie.h projects/pnfs-planb-server/sys/sys/time.h projects/pnfs-planb-server/sys/vm/pmap.h projects/pnfs-planb-server/sys/vm/vm_fault.c projects/pnfs-planb-server/sys/vm/vm_object.c projects/pnfs-planb-server/sys/vm/vm_page.c projects/pnfs-planb-server/sys/vm/vm_reserv.c projects/pnfs-planb-server/sys/vm/vm_reserv.h projects/pnfs-planb-server/sys/vm/vnode_pager.c projects/pnfs-planb-server/sys/vm/vnode_pager.h Directory Properties: projects/pnfs-planb-server/sys/ (props changed) projects/pnfs-planb-server/sys/amd64/amd64/efirt.c (props changed) projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/ (props changed) projects/pnfs-planb-server/sys/contrib/dev/acpica/ (props changed) projects/pnfs-planb-server/sys/contrib/ipfilter/ (props changed) projects/pnfs-planb-server/sys/contrib/octeon-sdk/ (props changed) projects/pnfs-planb-server/sys/gnu/dts/arm/ (props changed) projects/pnfs-planb-server/sys/gnu/dts/include/ (props changed) Modified: projects/pnfs-planb-server/sys/amd64/amd64/pmap.c ============================================================================== --- projects/pnfs-planb-server/sys/amd64/amd64/pmap.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/amd64/amd64/pmap.c Sat Jul 29 20:19:37 2017 (r321690) @@ -582,6 +582,12 @@ pmap_delayed_invl_page(vm_page_t m) */ static caddr_t crashdumpmap; +/* + * Internal flags for pmap_enter()'s helper functions. + */ +#define PMAP_ENTER_NORECLAIM 0x1000000 /* Don't reclaim PV entries. */ +#define PMAP_ENTER_NOREPLACE 0x2000000 /* Don't replace mappings. */ + static void free_pv_chunk(struct pv_chunk *pc); static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t pmap, struct rwlock **lockp); @@ -591,8 +597,8 @@ static void reserve_pv_entries(pmap_t pmap, int needed struct rwlock **lockp); static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, struct rwlock **lockp); -static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, - struct rwlock **lockp); +static bool pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, pd_entry_t pde, + u_int flags, struct rwlock **lockp); static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, struct rwlock **lockp); static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va); @@ -605,8 +611,10 @@ static boolean_t pmap_demote_pde_locked(pmap_t pmap, p vm_offset_t va, struct rwlock **lockp); static boolean_t pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va); -static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, - vm_prot_t prot, struct rwlock **lockp); +static bool pmap_enter_2mpage(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot, struct rwlock **lockp); +static int pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, + u_int flags, vm_page_t m, struct rwlock **lockp); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte, struct rwlock **lockp); static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); @@ -1389,7 +1397,7 @@ pmap_cache_mask(pmap_t pmap, boolean_t is_pde) return (mask); } -static __inline boolean_t +bool pmap_ps_enabled(pmap_t pmap) { @@ -3393,27 +3401,30 @@ pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, } /* - * Conditionally create the PV entry for a 2MB page mapping if the required - * memory can be allocated without resorting to reclamation. + * Create the PV entry for a 2MB page mapping. Always returns true unless the + * flag PMAP_ENTER_NORECLAIM is specified. If that flag is specified, returns + * false if the PV entry cannot be allocated without resorting to reclamation. */ -static boolean_t -pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, +static bool +pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, pd_entry_t pde, u_int flags, struct rwlock **lockp) { struct md_page *pvh; pv_entry_t pv; + vm_paddr_t pa; PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* Pass NULL instead of the lock pointer to disable reclamation. */ - if ((pv = get_pv_entry(pmap, NULL)) != NULL) { - pv->pv_va = va; - CHANGE_PV_LIST_LOCK_TO_PHYS(lockp, pa); - pvh = pa_to_pvh(pa); - TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_next); - pvh->pv_gen++; - return (TRUE); - } else - return (FALSE); + if ((pv = get_pv_entry(pmap, (flags & PMAP_ENTER_NORECLAIM) != 0 ? + NULL : lockp)) == NULL) + return (false); + pv->pv_va = va; + pa = pde & PG_PS_FRAME; + CHANGE_PV_LIST_LOCK_TO_PHYS(lockp, pa); + pvh = pa_to_pvh(pa); + TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_next); + pvh->pv_gen++; + return (true); } /* @@ -4323,7 +4334,7 @@ setpte: */ int pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - u_int flags, int8_t psind __unused) + u_int flags, int8_t psind) { struct rwlock *lock; pd_entry_t *pde; @@ -4351,6 +4362,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v ("pmap_enter: managed mapping within the clean submap")); if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) VM_OBJECT_ASSERT_LOCKED(m->object); + KASSERT((flags & PMAP_ENTER_RESERVED) == 0, + ("pmap_enter: flags %u has reserved bits set", flags)); pa = VM_PAGE_TO_PHYS(m); newpte = (pt_entry_t)(pa | PG_A | PG_V); if ((flags & VM_PROT_WRITE) != 0) @@ -4367,7 +4380,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v newpte |= PG_U; if (pmap == kernel_pmap) newpte |= PG_G; - newpte |= pmap_cache_bits(pmap, m->md.pat_mode, 0); + newpte |= pmap_cache_bits(pmap, m->md.pat_mode, psind > 0); /* * Set modified bit gratuitously for writeable mappings if @@ -4380,10 +4393,16 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v } else newpte |= PG_MANAGED; - mpte = NULL; - lock = NULL; PMAP_LOCK(pmap); + if (psind == 1) { + /* Assert the required virtual and physical alignment. */ + KASSERT((va & PDRMASK) == 0, ("pmap_enter: va unaligned")); + KASSERT(m->psind > 0, ("pmap_enter: m->psind < psind")); + rv = pmap_enter_pde(pmap, va, newpte | PG_PS, flags, m, &lock); + goto out; + } + mpte = NULL; /* * In the case that a page table page is not @@ -4543,48 +4562,118 @@ out: } /* - * Tries to create a 2MB page mapping. Returns TRUE if successful and FALSE - * otherwise. Fails if (1) a page table page cannot be allocated without - * blocking, (2) a mapping already exists at the specified virtual address, or - * (3) a pv entry cannot be allocated without reclaiming another pv entry. + * Tries to create a read- and/or execute-only 2MB page mapping. Returns true + * if successful. Returns false if (1) a page table page cannot be allocated + * without sleeping, (2) a mapping already exists at the specified virtual + * address, or (3) a PV entry cannot be allocated without reclaiming another + * PV entry. */ -static boolean_t -pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, +static bool +pmap_enter_2mpage(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, struct rwlock **lockp) { - pd_entry_t *pde, newpde; + pd_entry_t newpde; pt_entry_t PG_V; - vm_page_t pdpg; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + PG_V = pmap_valid_bit(pmap); + newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(pmap, m->md.pat_mode, 1) | + PG_PS | PG_V; + if ((m->oflags & VPO_UNMANAGED) == 0) + newpde |= PG_MANAGED; + if ((prot & VM_PROT_EXECUTE) == 0) + newpde |= pg_nx; + if (va < VM_MAXUSER_ADDRESS) + newpde |= PG_U; + return (pmap_enter_pde(pmap, va, newpde, PMAP_ENTER_NOSLEEP | + PMAP_ENTER_NOREPLACE | PMAP_ENTER_NORECLAIM, NULL, lockp) == + KERN_SUCCESS); +} + +/* + * Tries to create the specified 2MB page mapping. Returns KERN_SUCCESS if + * the mapping was created, and either KERN_FAILURE or KERN_RESOURCE_SHORTAGE + * otherwise. Returns KERN_FAILURE if PMAP_ENTER_NOREPLACE was specified and + * a mapping already exists at the specified virtual address. Returns + * KERN_RESOURCE_SHORTAGE if PMAP_ENTER_NOSLEEP was specified and a page table + * page allocation failed. Returns KERN_RESOURCE_SHORTAGE if + * PMAP_ENTER_NORECLAIM was specified and a PV entry allocation failed. + * + * The parameter "m" is only used when creating a managed, writeable mapping. + */ +static int +pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, + vm_page_t m, struct rwlock **lockp) +{ struct spglist free; + pd_entry_t oldpde, *pde; + pt_entry_t PG_G, PG_RW, PG_V; + vm_page_t mt, pdpg; + PG_G = pmap_global_bit(pmap); + PG_RW = pmap_rw_bit(pmap); + KASSERT((newpde & (pmap_modified_bit(pmap) | PG_RW)) != PG_RW, + ("pmap_enter_pde: newpde is missing PG_M")); PG_V = pmap_valid_bit(pmap); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - if ((pdpg = pmap_allocpde(pmap, va, NULL)) == NULL) { + if ((pdpg = pmap_allocpde(pmap, va, (flags & PMAP_ENTER_NOSLEEP) != 0 ? + NULL : lockp)) == NULL) { CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx" " in pmap %p", va, pmap); - return (FALSE); + return (KERN_RESOURCE_SHORTAGE); } pde = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pdpg)); pde = &pde[pmap_pde_index(va)]; - if ((*pde & PG_V) != 0) { + oldpde = *pde; + if ((oldpde & PG_V) != 0) { KASSERT(pdpg->wire_count > 1, ("pmap_enter_pde: pdpg's wire count is too low")); - pdpg->wire_count--; - CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx" - " in pmap %p", va, pmap); - return (FALSE); + if ((flags & PMAP_ENTER_NOREPLACE) != 0) { + pdpg->wire_count--; + CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx" + " in pmap %p", va, pmap); + return (KERN_FAILURE); + } + /* Break the existing mapping(s). */ + SLIST_INIT(&free); + if ((oldpde & PG_PS) != 0) { + /* + * The reference to the PD page that was acquired by + * pmap_allocpde() ensures that it won't be freed. + * However, if the PDE resulted from a promotion, then + * a reserved PT page could be freed. + */ + (void)pmap_remove_pde(pmap, pde, va, &free, lockp); + if ((oldpde & PG_G) == 0) + pmap_invalidate_pde_page(pmap, va, oldpde); + } else { + pmap_delayed_invl_started(); + if (pmap_remove_ptes(pmap, va, va + NBPDR, pde, &free, + lockp)) + pmap_invalidate_all(pmap); + pmap_delayed_invl_finished(); + } + pmap_free_zero_pages(&free); + if (va >= VM_MAXUSER_ADDRESS) { + mt = PHYS_TO_VM_PAGE(*pde & PG_FRAME); + if (pmap_insert_pt_page(pmap, mt)) { + /* + * XXX Currently, this can't happen because + * we do not perform pmap_enter(psind == 1) + * on the kernel pmap. + */ + panic("pmap_enter_pde: trie insert failed"); + } + } else + KASSERT(*pde == 0, ("pmap_enter_pde: non-zero pde %p", + pde)); } - newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(pmap, m->md.pat_mode, 1) | - PG_PS | PG_V; - if ((m->oflags & VPO_UNMANAGED) == 0) { - newpde |= PG_MANAGED; - + if ((newpde & PG_MANAGED) != 0) { /* * Abort this mapping if its PV entry could not be created. */ - if (!pmap_pv_insert_pde(pmap, va, VM_PAGE_TO_PHYS(m), - lockp)) { + if (!pmap_pv_insert_pde(pmap, va, newpde, flags, lockp)) { SLIST_INIT(&free); if (pmap_unwire_ptp(pmap, va, pdpg, &free)) { /* @@ -4598,17 +4687,19 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t } CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx" " in pmap %p", va, pmap); - return (FALSE); + return (KERN_RESOURCE_SHORTAGE); } + if ((newpde & PG_RW) != 0) { + for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++) + vm_page_aflag_set(mt, PGA_WRITEABLE); + } } - if ((prot & VM_PROT_EXECUTE) == 0) - newpde |= pg_nx; - if (va < VM_MAXUSER_ADDRESS) - newpde |= PG_U; /* * Increment counters. */ + if ((newpde & PG_W) != 0) + pmap->pm_stats.wired_count += NBPDR / PAGE_SIZE; pmap_resident_count_inc(pmap, NBPDR / PAGE_SIZE); /* @@ -4620,7 +4711,7 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t atomic_add_long(&pmap_pde_mappings, 1); CTR2(KTR_PMAP, "pmap_enter_pde: success for va %#lx" " in pmap %p", va, pmap); - return (TRUE); + return (KERN_SUCCESS); } /* @@ -4655,7 +4746,7 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_o va = start + ptoa(diff); if ((va & PDRMASK) == 0 && va + NBPDR <= end && m->psind == 1 && pmap_ps_enabled(pmap) && - pmap_enter_pde(pmap, va, m, prot, &lock)) + pmap_enter_2mpage(pmap, va, m, prot, &lock)) m = &m[NBPDR / PAGE_SIZE - 1]; else mpte = pmap_enter_quick_locked(pmap, va, m, prot, @@ -5088,8 +5179,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dst_pdpg)); pde = &pde[pmap_pde_index(addr)]; if (*pde == 0 && ((srcptepaddr & PG_MANAGED) == 0 || - pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr & - PG_PS_FRAME, &lock))) { + pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr, + PMAP_ENTER_NORECLAIM, &lock))) { *pde = srcptepaddr & ~PG_W; pmap_resident_count_inc(dst_pmap, NBPDR / PAGE_SIZE); atomic_add_long(&pmap_pde_mappings, 1); Modified: projects/pnfs-planb-server/sys/amd64/include/pmap.h ============================================================================== --- projects/pnfs-planb-server/sys/amd64/include/pmap.h Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/amd64/include/pmap.h Sat Jul 29 20:19:37 2017 (r321690) @@ -408,6 +408,7 @@ void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, int); boolean_t pmap_page_is_mapped(vm_page_t m); void pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma); void pmap_pinit_pml4(vm_page_t); +bool pmap_ps_enabled(pmap_t pmap); void pmap_unmapdev(vm_offset_t, vm_size_t); void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); Modified: projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_a64.c ============================================================================== --- projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_a64.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_a64.c Sat Jul 29 20:19:37 2017 (r321690) @@ -712,7 +712,7 @@ static struct clk_fixed_def *fixed_factor_clks[] = { static struct aw_clk_init init_clks[] = { {"ahb1", "pll_periph0", 0, false}, {"ahb2", "pll_periph0", 0, false}, - {"dram", "pll_ddr", 0, false}, + {"dram", "pll_ddr0", 0, false}, }; void Modified: projects/pnfs-planb-server/sys/arm/arm/mpcore_timer.c ============================================================================== --- projects/pnfs-planb-server/sys/arm/arm/mpcore_timer.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm/arm/mpcore_timer.c Sat Jul 29 20:19:37 2017 (r321690) @@ -351,7 +351,7 @@ attach_et(struct arm_tmr_softc *sc) sc->et.et_flags = ET_FLAGS_PERIODIC | ET_FLAGS_ONESHOT | ET_FLAGS_PERCPU; sc->et.et_quality = 1000; sc->et.et_frequency = sc->clkfreq; - sc->et.et_min_period = 20 * SBT_1NS; + sc->et.et_min_period = nstosbt(20); sc->et.et_max_period = 2 * SBT_1S; sc->et.et_start = arm_tmr_start; sc->et.et_stop = arm_tmr_stop; Modified: projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c ============================================================================== --- projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c Sat Jul 29 20:19:37 2017 (r321690) @@ -525,8 +525,8 @@ pmap_remap_vm_attr(vm_memattr_t old_attr, vm_memattr_t int old_idx, new_idx; /* Map VM memattrs to indexes to tex_class table. */ - old_idx = pte2_attr_tab[(int)old_attr]; - new_idx = pte2_attr_tab[(int)new_attr]; + old_idx = PTE2_ATTR2IDX(pte2_attr_tab[(int)old_attr]); + new_idx = PTE2_ATTR2IDX(pte2_attr_tab[(int)new_attr]); /* Replace TEX attribute and apply it. */ tex_class[old_idx] = tex_class[new_idx]; Modified: projects/pnfs-planb-server/sys/arm/freescale/imx/imx_i2c.c ============================================================================== --- projects/pnfs-planb-server/sys/arm/freescale/imx/imx_i2c.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm/freescale/imx/imx_i2c.c Sat Jul 29 20:19:37 2017 (r321690) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -138,8 +139,18 @@ struct i2c_softc { int rb_pinctl_idx; gpio_pin_t rb_sclpin; gpio_pin_t rb_sdapin; + u_int debug; + u_int slave; }; +#define DEVICE_DEBUGF(sc, lvl, fmt, args...) \ + if ((lvl) <= (sc)->debug) \ + device_printf((sc)->dev, fmt, ##args) + +#define DEBUGF(sc, lvl, fmt, args...) \ + if ((lvl) <= (sc)->debug) \ + printf(fmt, ##args) + static phandle_t i2c_get_node(device_t, device_t); static int i2c_probe(device_t); static int i2c_attach(device_t); @@ -383,6 +394,12 @@ i2c_attach(device_t dev) return (ENXIO); } + /* Set up debug-enable sysctl. */ + SYSCTL_ADD_INT(device_get_sysctl_ctx(sc->dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)), + OID_AUTO, "debug", CTLFLAG_RWTUN, &sc->debug, 0, + "Enable debug; 1=reads/writes, 2=add starts/stops"); + /* * Set up for bus recovery using gpio pins, if the pinctrl and gpio * properties are present. This is optional. If all the config data is @@ -450,6 +467,8 @@ i2c_repeated_start(device_t dev, u_char slave, int tim DELAY(1); i2c_write_reg(sc, I2C_STATUS_REG, 0x0); i2c_write_reg(sc, I2C_DATA_REG, slave); + sc->slave = slave; + DEVICE_DEBUGF(sc, 2, "rstart 0x%02x\n", sc->slave); error = wait_for_xfer(sc, true); return (i2c_error_handler(sc, error)); } @@ -472,6 +491,8 @@ i2c_start_ll(device_t dev, u_char slave, int timeout) return (i2c_error_handler(sc, error)); i2c_write_reg(sc, I2C_STATUS_REG, 0); i2c_write_reg(sc, I2C_DATA_REG, slave); + sc->slave = slave; + DEVICE_DEBUGF(sc, 2, "start 0x%02x\n", sc->slave); error = wait_for_xfer(sc, true); return (i2c_error_handler(sc, error)); } @@ -511,6 +532,7 @@ i2c_stop(device_t dev) i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN); wait_for_busbusy(sc, false); i2c_write_reg(sc, I2C_CONTROL_REG, 0); + DEVICE_DEBUGF(sc, 2, "stop 0x%02x\n", sc->slave); return (IIC_NOERR); } @@ -522,6 +544,8 @@ i2c_reset(device_t dev, u_char speed, u_char addr, u_c sc = device_get_softc(dev); + DEVICE_DEBUGF(sc, 1, "reset\n"); + /* * Look up the divisor that gives the nearest speed that doesn't exceed * the configured value for the bus. @@ -567,6 +591,7 @@ i2c_read(device_t dev, char *buf, int len, int *read, sc = device_get_softc(dev); *read = 0; + DEVICE_DEBUGF(sc, 1, "read 0x%02x len %d: ", sc->slave, len); if (len) { if (len == 1) i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | @@ -598,9 +623,11 @@ i2c_read(device_t dev, char *buf, int len, int *read, } } reg = i2c_read_reg(sc, I2C_DATA_REG); + DEBUGF(sc, 1, "0x%02x ", reg); *buf++ = reg; (*read)++; } + DEBUGF(sc, 1, "\n"); return (i2c_error_handler(sc, error)); } @@ -615,13 +642,15 @@ i2c_write(device_t dev, const char *buf, int len, int error = 0; *sent = 0; + DEVICE_DEBUGF(sc, 1, "write 0x%02x len %d: ", sc->slave, len); while (*sent < len) { + DEBUGF(sc, 1, "0x%02x ", *buf); i2c_write_reg(sc, I2C_STATUS_REG, 0x0); i2c_write_reg(sc, I2C_DATA_REG, *buf++); if ((error = wait_for_xfer(sc, true)) != IIC_NOERR) break; (*sent)++; } - + DEBUGF(sc, 1, "\n"); return (i2c_error_handler(sc, error)); } Modified: projects/pnfs-planb-server/sys/arm/include/pte-v6.h ============================================================================== --- projects/pnfs-planb-server/sys/arm/include/pte-v6.h Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm/include/pte-v6.h Sat Jul 29 20:19:37 2017 (r321690) @@ -149,10 +149,12 @@ #define L2_NX 0x00000001 /* Not executable */ #define L2_B 0x00000004 /* Bufferable page */ #define L2_C 0x00000008 /* Cacheable page */ +#define L2_CB_SHIFT 2 /* C,B bit field shift */ #define L2_AP(x) ((x) << 4) #define L2_AP0 0x00000010 /* access permissions bit 0*/ #define L2_AP1 0x00000020 /* access permissions bit 1*/ -#define L2_TEX(x) ((x) << 6) /* type extension */ +#define L2_TEX_SHIFT 6 /* type extension field shift */ +#define L2_TEX(x) ((x) << L2_TEX_SHIFT) /* type extension */ #define L2_TEX0 0x00000040 /* type extension bit 0 */ #define L2_TEX1 0x00000080 /* type extension bit 1 */ #define L2_TEX2 0x00000100 /* type extension bit 2 */ @@ -271,6 +273,10 @@ #define PTE2_FRAME L2_S_FRAME #define PTE2_ATTR_MASK (L2_TEX0 | L2_C | L2_B) +/* PTE2 attributes to TEX class index: (TEX0 C B) */ +#define PTE2_ATTR2IDX(attr) \ + ((((attr) & (L2_C | L2_B)) >> L2_CB_SHIFT) | \ + (((attr) & L2_TEX0) >> (L2_TEX_SHIFT - L2_CB_SHIFT))) #define PTE2_AP_KR (PTE2_RO | PTE2_NM) #define PTE2_AP_KRW 0 Modified: projects/pnfs-planb-server/sys/arm/include/ucontext.h ============================================================================== --- projects/pnfs-planb-server/sys/arm/include/ucontext.h Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm/include/ucontext.h Sat Jul 29 20:19:37 2017 (r321690) @@ -78,7 +78,7 @@ typedef struct { * Originally, rest of this structure was named __fpu, 35 * 4 bytes * long, never accessed from kernel. */ - size_t mc_vfp_size; + __size_t mc_vfp_size; void *mc_vfp_ptr; unsigned int mc_spare[33]; } mcontext_t; Modified: projects/pnfs-planb-server/sys/arm/mv/mv_machdep.c ============================================================================== --- projects/pnfs-planb-server/sys/arm/mv/mv_machdep.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm/mv/mv_machdep.c Sat Jul 29 20:19:37 2017 (r321690) @@ -301,7 +301,7 @@ platform_late_init(void) * To avoid that, map all registers including PCIe IO * as strongly ordered instead of device memory. */ - pmap_remap_vm_attr(PTE2_ATTR_DEVICE, PTE2_ATTR_SO); + pmap_remap_vm_attr(VM_MEMATTR_DEVICE, VM_MEMATTR_SO); /* Set IO Sync Barrier bit for all Mbus devices */ if (armada38x_win_set_iosync_barrier() != 0) Modified: projects/pnfs-planb-server/sys/arm64/arm64/trap.c ============================================================================== --- projects/pnfs-planb-server/sys/arm64/arm64/trap.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/arm64/arm64/trap.c Sat Jul 29 20:19:37 2017 (r321690) @@ -265,6 +265,7 @@ print_registers(struct trapframe *frame) void do_el1h_sync(struct thread *td, struct trapframe *frame) { + struct trapframe *oframe; uint32_t exception; uint64_t esr, far; @@ -281,6 +282,18 @@ do_el1h_sync(struct thread *td, struct trapframe *fram "do_el1_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", td, esr, frame->tf_elr, frame); + oframe = td->td_frame; + + switch (exception) { + case EXCP_BRK: + case EXCP_WATCHPT_EL1: + case EXCP_SOFTSTP_EL1: + break; + default: + td->td_frame = frame; + break; + } + switch(exception) { case EXCP_FP_SIMD: case EXCP_TRAP_FP: @@ -313,7 +326,8 @@ do_el1h_sync(struct thread *td, struct trapframe *fram case EXCP_WATCHPT_EL1: case EXCP_SOFTSTP_EL1: #ifdef KDB - kdb_trap(exception, 0, frame); + kdb_trap(exception, 0, + (td->td_frame != NULL) ? td->td_frame : frame); #else panic("No debugger in kernel.\n"); #endif @@ -323,6 +337,8 @@ do_el1h_sync(struct thread *td, struct trapframe *fram panic("Unknown kernel exception %x esr_el1 %lx\n", exception, esr); } + + td->td_frame = oframe; } /* Modified: projects/pnfs-planb-server/sys/boot/efi/libefi/efinet.c ============================================================================== --- projects/pnfs-planb-server/sys/boot/efi/libefi/efinet.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/boot/efi/libefi/efinet.c Sat Jul 29 20:19:37 2017 (r321690) @@ -187,6 +187,7 @@ efinet_init(struct iodesc *desc, void *machdep_hint) EFI_SIMPLE_NETWORK *net; EFI_HANDLE h; EFI_STATUS status; + UINT32 mask; if (nif->nif_driver->netif_ifs[nif->nif_unit].dif_unit < 0) { printf("Invalid network interface %d\n", nif->nif_unit); @@ -220,16 +221,14 @@ efinet_init(struct iodesc *desc, void *machdep_hint) } } - if (net->Mode->ReceiveFilterSetting == 0) { - UINT32 mask = EFI_SIMPLE_NETWORK_RECEIVE_UNICAST | - EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST; + mask = EFI_SIMPLE_NETWORK_RECEIVE_UNICAST | + EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST; - status = net->ReceiveFilters(net, mask, 0, FALSE, 0, NULL); - if (status != EFI_SUCCESS) { - printf("net%d: cannot set rx. filters (status=%lu)\n", - nif->nif_unit, EFI_ERROR_CODE(status)); - return; - } + status = net->ReceiveFilters(net, mask, 0, FALSE, 0, NULL); + if (status != EFI_SUCCESS) { + printf("net%d: cannot set rx. filters (status=%lu)\n", + nif->nif_unit, EFI_ERROR_CODE(status)); + return; } #ifdef EFINET_DEBUG Modified: projects/pnfs-planb-server/sys/cam/ata/ata_da.c ============================================================================== --- projects/pnfs-planb-server/sys/cam/ata/ata_da.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/cam/ata/ata_da.c Sat Jul 29 20:19:37 2017 (r321690) @@ -1320,7 +1320,7 @@ adaasync(void *callback_arg, u_int32_t code, xpt_action((union ccb *)&cgd); if (ADA_RA >= 0 && softc->flags & ADA_FLAG_CAN_RAHEAD) softc->state = ADA_STATE_RAHEAD; - else if (ADA_WC >= 0 && softc->flags & ADA_FLAG_CAN_RAHEAD) + else if (ADA_WC >= 0 && softc->flags & ADA_FLAG_CAN_WCACHE) softc->state = ADA_STATE_WCACHE; else if ((softc->flags & ADA_FLAG_CAN_LOG) && (softc->zone_mode != ADA_ZONE_NONE)) Modified: projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c ============================================================================== --- projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Jul 29 20:19:37 2017 (r321690) @@ -4270,6 +4270,16 @@ spa_import_rootpool(const char *name) if ((spa = spa_lookup(pname)) != NULL) { /* + * The pool could already be imported, + * e.g., after reboot -r. + */ + if (spa->spa_state == POOL_STATE_ACTIVE) { + mutex_exit(&spa_namespace_lock); + nvlist_free(config); + return (0); + } + + /* * Remove the existing root pool from the namespace so * that we can replace it with the correct config * we just read in. Modified: projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_fd.c ============================================================================== --- projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_fd.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_fd.c Sat Jul 29 20:19:37 2017 (r321690) @@ -111,8 +111,6 @@ cloudabi_sys_fd_create1(struct thread *td, return (kern_shm_open(td, SHM_ANON, O_RDWR, 0, &fcaps)); case CLOUDABI_FILETYPE_SOCKET_DGRAM: return (kern_socket(td, AF_UNIX, SOCK_DGRAM, 0)); - case CLOUDABI_FILETYPE_SOCKET_SEQPACKET: - return (kern_socket(td, AF_UNIX, SOCK_SEQPACKET, 0)); case CLOUDABI_FILETYPE_SOCKET_STREAM: return (kern_socket(td, AF_UNIX, SOCK_STREAM, 0)); default: @@ -145,9 +143,6 @@ cloudabi_sys_fd_create2(struct thread *td, case CLOUDABI_FILETYPE_SOCKET_DGRAM: error = kern_socketpair(td, AF_UNIX, SOCK_DGRAM, 0, fds); break; - case CLOUDABI_FILETYPE_SOCKET_SEQPACKET: - error = kern_socketpair(td, AF_UNIX, SOCK_SEQPACKET, 0, fds); - break; case CLOUDABI_FILETYPE_SOCKET_STREAM: error = kern_socketpair(td, AF_UNIX, SOCK_STREAM, 0, fds); break; @@ -245,8 +240,6 @@ cloudabi_convert_filetype(const struct file *fp) switch (so->so_type) { case SOCK_DGRAM: return (CLOUDABI_FILETYPE_SOCKET_DGRAM); - case SOCK_SEQPACKET: - return (CLOUDABI_FILETYPE_SOCKET_SEQPACKET); case SOCK_STREAM: return (CLOUDABI_FILETYPE_SOCKET_STREAM); default: @@ -400,7 +393,6 @@ cloudabi_remove_conflicting_rights(cloudabi_filetype_t *inheriting = 0; break; case CLOUDABI_FILETYPE_SOCKET_DGRAM: - case CLOUDABI_FILETYPE_SOCKET_SEQPACKET: case CLOUDABI_FILETYPE_SOCKET_STREAM: *base &= CLOUDABI_RIGHT_FD_READ | CLOUDABI_RIGHT_FD_STAT_PUT_FLAGS | Modified: projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_mem.c ============================================================================== --- projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_mem.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_mem.c Sat Jul 29 20:19:37 2017 (r321690) @@ -90,14 +90,6 @@ cloudabi_sys_mem_advise(struct thread *td, } int -cloudabi_sys_mem_lock(struct thread *td, struct cloudabi_sys_mem_lock_args *uap) -{ - - return (kern_mlock(td->td_proc, td->td_ucred, - __DECONST(uintptr_t, uap->mapping), uap->mapping_len)); -} - -int cloudabi_sys_mem_map(struct thread *td, struct cloudabi_sys_mem_map_args *uap) { int error, flags, prot; @@ -158,15 +150,6 @@ cloudabi_sys_mem_sync(struct thread *td, struct clouda return (kern_msync(td, (uintptr_t)uap->mapping, uap->mapping_len, flags)); -} - -int -cloudabi_sys_mem_unlock(struct thread *td, - struct cloudabi_sys_mem_unlock_args *uap) -{ - - return (kern_munlock(td, __DECONST(uintptr_t, uap->mapping), - uap->mapping_len)); } int Modified: projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_sock.c ============================================================================== --- projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_sock.c Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_sock.c Sat Jul 29 20:19:37 2017 (r321690) @@ -49,43 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* Converts FreeBSD's struct sockaddr to CloudABI's cloudabi_sockaddr_t. */ -static void -cloudabi_convert_sockaddr(const struct sockaddr *sa, socklen_t sal, - cloudabi_sockaddr_t *rsa) -{ - const struct sockaddr_in *sin; - const struct sockaddr_in6 *sin6; - - /* Zero-sized socket address. */ - if (sal < offsetof(struct sockaddr, sa_family) + sizeof(sa->sa_family)) - return; - - switch (sa->sa_family) { - case AF_INET: - if (sal < sizeof(struct sockaddr_in)) - return; - sin = (const struct sockaddr_in *)sa; - rsa->sa_family = CLOUDABI_AF_INET; - memcpy(&rsa->sa_inet.addr, &sin->sin_addr, - sizeof(rsa->sa_inet.addr)); - rsa->sa_inet.port = ntohs(sin->sin_port); - return; - case AF_INET6: - if (sal < sizeof(struct sockaddr_in6)) - return; - sin6 = (const struct sockaddr_in6 *)sa; - rsa->sa_family = CLOUDABI_AF_INET6; - memcpy(&rsa->sa_inet6.addr, &sin6->sin6_addr, - sizeof(rsa->sa_inet6.addr)); - rsa->sa_inet6.port = ntohs(sin6->sin6_port); - return; - case AF_UNIX: - rsa->sa_family = CLOUDABI_AF_UNIX; - return; - } -} - /* Copies a pathname into a UNIX socket address structure. */ static int copyin_sockaddr_un(const char *path, size_t pathlen, struct sockaddr_un *sun) @@ -112,27 +75,8 @@ int cloudabi_sys_sock_accept(struct thread *td, struct cloudabi_sys_sock_accept_args *uap) { - struct sockaddr *sa; - cloudabi_sockstat_t ss = {}; - socklen_t sal; - int error; - if (uap->buf == NULL) { - /* Only return the new file descriptor number. */ - return (kern_accept(td, uap->sock, NULL, NULL, NULL)); - } else { - /* Also return properties of the new socket descriptor. */ - sal = MAX(sizeof(struct sockaddr_in), - sizeof(struct sockaddr_in6)); - error = kern_accept(td, uap->sock, (void *)&sa, &sal, NULL); - if (error != 0) - return (error); - - /* TODO(ed): Fill the other members of cloudabi_sockstat_t. */ - cloudabi_convert_sockaddr(sa, sal, &ss.ss_peername); - free(sa, M_SONAME); - return (copyout(&ss, uap->buf, sizeof(ss))); - } + return (kern_accept(td, uap->sock, NULL, NULL, NULL)); } int @@ -200,7 +144,6 @@ cloudabi_sys_sock_stat_get(struct thread *td, cloudabi_sockstat_t ss = {}; cap_rights_t rights; struct file *fp; - struct sockaddr *sa; struct socket *so; int error; @@ -210,27 +153,6 @@ cloudabi_sys_sock_stat_get(struct thread *td, return (error); so = fp->f_data; - CURVNET_SET(so->so_vnet); - - /* Set ss_sockname. */ - error = so->so_proto->pr_usrreqs->pru_sockaddr(so, &sa); - if (error == 0) { - cloudabi_convert_sockaddr(sa, sa->sa_len, &ss.ss_sockname); - free(sa, M_SONAME); - } - - /* Set ss_peername. */ - if ((so->so_state & (SS_ISCONNECTED | SS_ISCONFIRMING)) != 0) { - error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa); - if (error == 0) { - cloudabi_convert_sockaddr(sa, sa->sa_len, - &ss.ss_peername); - free(sa, M_SONAME); - } - } - - CURVNET_RESTORE(); - /* Set ss_error. */ SOCK_LOCK(so); ss.ss_error = cloudabi_convert_errno(so->so_error); @@ -249,8 +171,8 @@ cloudabi_sys_sock_stat_get(struct thread *td, int cloudabi_sock_recv(struct thread *td, cloudabi_fd_t fd, struct iovec *data, size_t datalen, cloudabi_fd_t *fds, size_t fdslen, - cloudabi_msgflags_t flags, size_t *rdatalen, size_t *rfdslen, - cloudabi_sockaddr_t *peername, cloudabi_msgflags_t *rflags) + cloudabi_riflags_t flags, size_t *rdatalen, size_t *rfdslen, + cloudabi_roflags_t *rflags) { struct sockaddr_storage ss; struct msghdr hdr = { @@ -263,9 +185,9 @@ cloudabi_sock_recv(struct thread *td, cloudabi_fd_t fd int error; /* Convert flags. */ - if (flags & CLOUDABI_MSG_PEEK) + if (flags & CLOUDABI_SOCK_RECV_PEEK) hdr.msg_flags |= MSG_PEEK; - if (flags & CLOUDABI_MSG_WAITALL) + if (flags & CLOUDABI_SOCK_RECV_WAITALL) hdr.msg_flags |= MSG_WAITALL; control = NULL; @@ -278,13 +200,9 @@ cloudabi_sock_recv(struct thread *td, cloudabi_fd_t fd *rdatalen = td->td_retval[0]; td->td_retval[0] = 0; *rfdslen = 0; - cloudabi_convert_sockaddr((struct sockaddr *)&ss, - MIN(hdr.msg_namelen, sizeof(ss)), peername); *rflags = 0; - if (hdr.msg_flags & MSG_EOR) - *rflags |= CLOUDABI_MSG_EOR; if (hdr.msg_flags & MSG_TRUNC) - *rflags |= CLOUDABI_MSG_TRUNC; + *rflags |= CLOUDABI_SOCK_RECV_DATA_TRUNCATED; /* Extract file descriptors from SCM_RIGHTS messages. */ if (control != NULL) { @@ -303,7 +221,8 @@ cloudabi_sock_recv(struct thread *td, cloudabi_fd_t fd if (nfds > fdslen) { /* Unable to store file descriptors. */ nfds = fdslen; - *rflags |= CLOUDABI_MSG_CTRUNC; + *rflags |= + CLOUDABI_SOCK_RECV_FDS_TRUNCATED; } error = copyout(CMSG_DATA(chdr), fds, nfds * sizeof(int)); @@ -323,21 +242,15 @@ cloudabi_sock_recv(struct thread *td, cloudabi_fd_t fd int cloudabi_sock_send(struct thread *td, cloudabi_fd_t fd, struct iovec *data, - size_t datalen, const cloudabi_fd_t *fds, size_t fdslen, - cloudabi_msgflags_t flags, size_t *rdatalen) + size_t datalen, const cloudabi_fd_t *fds, size_t fdslen, size_t *rdatalen) { struct msghdr hdr = { .msg_iov = data, .msg_iovlen = datalen, }; struct mbuf *control; - int error, mflags; + int error; - /* Convert flags. */ - mflags = MSG_NOSIGNAL; - if (flags & CLOUDABI_MSG_EOR) - mflags |= MSG_EOR; - /* Convert file descriptor array to an SCM_RIGHTS message. */ if (fdslen > MCLBYTES || CMSG_SPACE(fdslen * sizeof(int)) > MCLBYTES) { return (EINVAL); @@ -361,7 +274,7 @@ cloudabi_sock_send(struct thread *td, cloudabi_fd_t fd control = NULL; } - error = kern_sendit(td, fd, &hdr, mflags, control, UIO_USERSPACE); + error = kern_sendit(td, fd, &hdr, MSG_NOSIGNAL, control, UIO_USERSPACE); if (error != 0) return (error); *rdatalen = td->td_retval[0]; Modified: projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_util.h ============================================================================== --- projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_util.h Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/compat/cloudabi/cloudabi_util.h Sat Jul 29 20:19:37 2017 (r321690) @@ -75,10 +75,10 @@ int cloudabi_futex_lock_wrlock(struct thread *, clouda /* Socket operations. */ int cloudabi_sock_recv(struct thread *, cloudabi_fd_t, struct iovec *, size_t, - cloudabi_fd_t *, size_t, cloudabi_msgflags_t, size_t *, size_t *, - cloudabi_sockaddr_t *, cloudabi_msgflags_t *); + cloudabi_fd_t *, size_t, cloudabi_riflags_t, size_t *, size_t *, + cloudabi_roflags_t *); int cloudabi_sock_send(struct thread *, cloudabi_fd_t, struct iovec *, size_t, - const cloudabi_fd_t *, size_t, cloudabi_msgflags_t, size_t *); + const cloudabi_fd_t *, size_t, size_t *); /* vDSO setup and teardown. */ void cloudabi_vdso_init(struct sysentvec *, char *, char *); Modified: projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_proto.h ============================================================================== --- projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_proto.h Sat Jul 29 20:08:25 2017 (r321689) +++ projects/pnfs-planb-server/sys/compat/cloudabi32/cloudabi32_proto.h Sat Jul 29 20:19:37 2017 (r321690) @@ -200,10 +200,6 @@ struct cloudabi_sys_mem_advise_args { char mapping_len_l_[PADL_(size_t)]; size_t mapping_len; char mapping_len_r_[PADR_(size_t)]; char advice_l_[PADL_(cloudabi_advice_t)]; cloudabi_advice_t advice; char advice_r_[PADR_(cloudabi_advice_t)]; }; -struct cloudabi_sys_mem_lock_args { - char mapping_l_[PADL_(const void *)]; const void * mapping; char mapping_r_[PADR_(const void *)]; - char mapping_len_l_[PADL_(size_t)]; size_t mapping_len; char mapping_len_r_[PADR_(size_t)]; -}; struct cloudabi_sys_mem_map_args { char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; @@ -222,10 +218,6 @@ struct cloudabi_sys_mem_sync_args { char mapping_len_l_[PADL_(size_t)]; size_t mapping_len; char mapping_len_r_[PADR_(size_t)]; char flags_l_[PADL_(cloudabi_msflags_t)]; cloudabi_msflags_t flags; char flags_r_[PADR_(cloudabi_msflags_t)]; }; -struct cloudabi_sys_mem_unlock_args { - char mapping_l_[PADL_(const void *)]; const void * mapping; char mapping_r_[PADR_(const void *)]; - char mapping_len_l_[PADL_(size_t)]; size_t mapping_len; char mapping_len_r_[PADR_(size_t)]; -}; struct cloudabi_sys_mem_unmap_args { char mapping_l_[PADL_(void *)]; void * mapping; char mapping_r_[PADR_(void *)]; char mapping_len_l_[PADL_(size_t)]; size_t mapping_len; char mapping_len_r_[PADR_(size_t)]; @@ -265,7 +257,7 @@ struct cloudabi_sys_random_get_args { }; struct cloudabi_sys_sock_accept_args { char sock_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t sock; char sock_r_[PADR_(cloudabi_fd_t)]; - char buf_l_[PADL_(cloudabi_sockstat_t *)]; cloudabi_sockstat_t * buf; char buf_r_[PADR_(cloudabi_sockstat_t *)]; + char unused_l_[PADL_(void *)]; void * unused; char unused_r_[PADR_(void *)]; }; struct cloudabi_sys_sock_bind_args { char sock_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t sock; char sock_r_[PADR_(cloudabi_fd_t)]; @@ -345,11 +337,9 @@ int cloudabi_sys_file_symlink(struct thread *, struct int cloudabi_sys_file_unlink(struct thread *, struct cloudabi_sys_file_unlink_args *); int cloudabi_sys_lock_unlock(struct thread *, struct cloudabi_sys_lock_unlock_args *); int cloudabi_sys_mem_advise(struct thread *, struct cloudabi_sys_mem_advise_args *); -int cloudabi_sys_mem_lock(struct thread *, struct cloudabi_sys_mem_lock_args *); int cloudabi_sys_mem_map(struct thread *, struct cloudabi_sys_mem_map_args *); int cloudabi_sys_mem_protect(struct thread *, struct cloudabi_sys_mem_protect_args *); int cloudabi_sys_mem_sync(struct thread *, struct cloudabi_sys_mem_sync_args *); -int cloudabi_sys_mem_unlock(struct thread *, struct cloudabi_sys_mem_unlock_args *); int cloudabi_sys_mem_unmap(struct thread *, struct cloudabi_sys_mem_unmap_args *); int cloudabi32_sys_poll(struct thread *, struct cloudabi32_sys_poll_args *); int cloudabi32_sys_poll_fd(struct thread *, struct cloudabi32_sys_poll_fd_args *); @@ -399,6 +389,12 @@ int cloudabi_sys_thread_yield(struct thread *, struct #endif /* COMPAT_FREEBSD10 */ + +#ifdef COMPAT_FREEBSD11 + + +#endif /* COMPAT_FREEBSD11 */ + #define CLOUDABI32_SYS_AUE_cloudabi_sys_clock_res_get AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_clock_time_get AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_condvar_signal AUE_NULL @@ -432,11 +428,9 @@ int cloudabi_sys_thread_yield(struct thread *, struct #define CLOUDABI32_SYS_AUE_cloudabi_sys_file_unlink AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_lock_unlock AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_mem_advise AUE_NULL -#define CLOUDABI32_SYS_AUE_cloudabi_sys_mem_lock AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_mem_map AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_mem_protect AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_mem_sync AUE_NULL -#define CLOUDABI32_SYS_AUE_cloudabi_sys_mem_unlock AUE_NULL #define CLOUDABI32_SYS_AUE_cloudabi_sys_mem_unmap AUE_NULL *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***