Date: Sat, 9 Apr 2016 12:17:31 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r297744 - in projects/vnet: . bin/csh cddl/contrib/opensolaris/lib/libzfs/common contrib/netbsd-tests/lib/libc/sys lib/libc/aarch64/gen lib/libc/aarch64/sys lib/libc/db/hash lib/libc/ge... Message-ID: <201604091217.u39CHV1f044516@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Sat Apr 9 12:17:31 2016 New Revision: 297744 URL: https://svnweb.freebsd.org/changeset/base/297744 Log: MFH @r297743 Added: projects/vnet/sys/arm/allwinner/aw_ccu.c - copied unchanged from r297743, head/sys/arm/allwinner/aw_ccu.c projects/vnet/sys/arm/allwinner/aw_reset.c - copied unchanged from r297743, head/sys/arm/allwinner/aw_reset.c projects/vnet/sys/arm/allwinner/clk/ - copied from r297743, head/sys/arm/allwinner/clk/ projects/vnet/sys/arm64/arm64/bzero.S - copied unchanged from r297743, head/sys/arm64/arm64/bzero.S projects/vnet/sys/dev/acpica/acpi_pcivar.h - copied unchanged from r297743, head/sys/dev/acpica/acpi_pcivar.h projects/vnet/sys/mips/mediatek/ - copied from r297743, head/sys/mips/mediatek/ projects/vnet/sys/x86/x86/autoconf.c - copied unchanged from r297743, head/sys/x86/x86/autoconf.c Deleted: projects/vnet/sys/amd64/amd64/autoconf.c projects/vnet/sys/arm/allwinner/a10_clk.c projects/vnet/sys/arm/allwinner/a10_clk.h projects/vnet/sys/arm/allwinner/a31/a31_clk.c projects/vnet/sys/arm/allwinner/a31/a31_clk.h projects/vnet/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/vnet/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/vnet/sys/i386/i386/autoconf.c Modified: projects/vnet/Makefile.inc1 projects/vnet/Makefile.libcompat projects/vnet/bin/csh/config_p.h projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/vnet/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c projects/vnet/lib/libc/aarch64/gen/Makefile.inc projects/vnet/lib/libc/aarch64/sys/Makefile.inc projects/vnet/lib/libc/db/hash/hash.c projects/vnet/lib/libc/gen/semctl.c projects/vnet/lib/libc/include/compat.h projects/vnet/lib/libc/locale/euc.c projects/vnet/lib/libc/locale/mskanji.c projects/vnet/lib/libthr/thread/thr_affinity.c projects/vnet/lib/libthr/thread/thr_attr.c projects/vnet/lib/libthr/thread/thr_autoinit.c projects/vnet/lib/libthr/thread/thr_barrier.c projects/vnet/lib/libthr/thread/thr_barrierattr.c projects/vnet/lib/libthr/thread/thr_cancel.c projects/vnet/lib/libthr/thread/thr_clean.c projects/vnet/lib/libthr/thread/thr_concurrency.c projects/vnet/lib/libthr/thread/thr_cond.c projects/vnet/lib/libthr/thread/thr_condattr.c projects/vnet/lib/libthr/thread/thr_create.c projects/vnet/lib/libthr/thread/thr_detach.c projects/vnet/lib/libthr/thread/thr_equal.c projects/vnet/lib/libthr/thread/thr_event.c projects/vnet/lib/libthr/thread/thr_exit.c projects/vnet/lib/libthr/thread/thr_fork.c projects/vnet/lib/libthr/thread/thr_getcpuclockid.c projects/vnet/lib/libthr/thread/thr_getprio.c projects/vnet/lib/libthr/thread/thr_getschedparam.c projects/vnet/lib/libthr/thread/thr_getthreadid_np.c projects/vnet/lib/libthr/thread/thr_info.c projects/vnet/lib/libthr/thread/thr_init.c projects/vnet/lib/libthr/thread/thr_join.c projects/vnet/lib/libthr/thread/thr_kern.c projects/vnet/lib/libthr/thread/thr_kill.c projects/vnet/lib/libthr/thread/thr_list.c projects/vnet/lib/libthr/thread/thr_main_np.c projects/vnet/lib/libthr/thread/thr_multi_np.c projects/vnet/lib/libthr/thread/thr_mutex.c projects/vnet/lib/libthr/thread/thr_mutexattr.c projects/vnet/lib/libthr/thread/thr_once.c projects/vnet/lib/libthr/thread/thr_printf.c projects/vnet/lib/libthr/thread/thr_private.h projects/vnet/lib/libthr/thread/thr_pspinlock.c projects/vnet/lib/libthr/thread/thr_resume_np.c projects/vnet/lib/libthr/thread/thr_rtld.c projects/vnet/lib/libthr/thread/thr_rwlock.c projects/vnet/lib/libthr/thread/thr_rwlockattr.c projects/vnet/lib/libthr/thread/thr_self.c projects/vnet/lib/libthr/thread/thr_sem.c projects/vnet/lib/libthr/thread/thr_setprio.c projects/vnet/lib/libthr/thread/thr_setschedparam.c projects/vnet/lib/libthr/thread/thr_sig.c projects/vnet/lib/libthr/thread/thr_single_np.c projects/vnet/lib/libthr/thread/thr_sleepq.c projects/vnet/lib/libthr/thread/thr_spec.c projects/vnet/lib/libthr/thread/thr_spinlock.c projects/vnet/lib/libthr/thread/thr_stack.c projects/vnet/lib/libthr/thread/thr_suspend_np.c projects/vnet/lib/libthr/thread/thr_switch_np.c projects/vnet/lib/libthr/thread/thr_symbols.c projects/vnet/lib/libthr/thread/thr_umtx.c projects/vnet/lib/libthr/thread/thr_yield.c projects/vnet/sbin/devd/devd.cc projects/vnet/sbin/devd/devd.conf.5 projects/vnet/sbin/fsck_msdosfs/dir.c projects/vnet/sbin/geom/class/eli/geli.8 projects/vnet/sbin/geom/class/eli/geom_eli.c projects/vnet/share/man/man4/usb_quirk.4 projects/vnet/share/misc/bsd-family-tree projects/vnet/share/mk/local.meta.sys.mk projects/vnet/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/vnet/sys/amd64/linux/linux_sysvec.c projects/vnet/sys/amd64/linux32/linux32_sysvec.c projects/vnet/sys/arm/allwinner/a10_ahci.c projects/vnet/sys/arm/allwinner/a10_codec.c projects/vnet/sys/arm/allwinner/a10_dmac.c projects/vnet/sys/arm/allwinner/a10_ehci.c projects/vnet/sys/arm/allwinner/a10_fb.c projects/vnet/sys/arm/allwinner/a10_hdmi.c projects/vnet/sys/arm/allwinner/a10_mmc.c projects/vnet/sys/arm/allwinner/a10_sramc.c projects/vnet/sys/arm/allwinner/a10_sramc.h projects/vnet/sys/arm/allwinner/a20/a20_if_dwc.c projects/vnet/sys/arm/allwinner/a31/a31_padconf.c projects/vnet/sys/arm/allwinner/aw_usbphy.c projects/vnet/sys/arm/allwinner/files.allwinner projects/vnet/sys/arm/allwinner/if_emac.c projects/vnet/sys/arm/arm/gic.c projects/vnet/sys/arm/arm/locore.S projects/vnet/sys/arm/arm/machdep_intr.c projects/vnet/sys/arm/arm/nexus.c projects/vnet/sys/arm/arm/physmem.c projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_intr.c projects/vnet/sys/arm/broadcom/bcm2835/bcm2836.c projects/vnet/sys/arm/broadcom/bcm2835/bcm2836.h projects/vnet/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/vnet/sys/arm/conf/A10 projects/vnet/sys/arm/conf/A20 projects/vnet/sys/arm/conf/BEAGLEBONE projects/vnet/sys/arm/conf/RPI-B projects/vnet/sys/arm/conf/RPI2 projects/vnet/sys/arm/freescale/imx/imx_gpio.c projects/vnet/sys/arm/include/intr.h projects/vnet/sys/arm/mv/mpic.c projects/vnet/sys/arm/nvidia/tegra124/tegra124_clk_pll.c projects/vnet/sys/arm/nvidia/tegra124/tegra124_clk_super.c projects/vnet/sys/arm/nvidia/tegra124/tegra124_cpufreq.c projects/vnet/sys/arm/nvidia/tegra_ehci.c projects/vnet/sys/arm/nvidia/tegra_lic.c projects/vnet/sys/arm/ti/aintc.c projects/vnet/sys/arm/ti/omap4/omap4_gpio.c projects/vnet/sys/arm/ti/omap4/omap4_wugen.c projects/vnet/sys/arm/ti/ti_gpio.c projects/vnet/sys/arm/ti/ti_gpio.h projects/vnet/sys/arm64/arm64/copyinout.S projects/vnet/sys/arm64/arm64/genassym.c projects/vnet/sys/arm64/arm64/gic.c projects/vnet/sys/arm64/arm64/gic_v3_its.c projects/vnet/sys/arm64/arm64/locore.S projects/vnet/sys/arm64/arm64/machdep.c projects/vnet/sys/arm64/arm64/mp_machdep.c projects/vnet/sys/arm64/arm64/pmap.c projects/vnet/sys/arm64/arm64/support.S projects/vnet/sys/arm64/cloudabi64/cloudabi64_sysvec.c projects/vnet/sys/arm64/include/armreg.h projects/vnet/sys/arm64/include/frame.h projects/vnet/sys/arm64/include/machdep.h projects/vnet/sys/arm64/include/vmparam.h projects/vnet/sys/boot/common/load_elf_obj.c projects/vnet/sys/boot/fdt/dts/arm/bananapi.dts projects/vnet/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/vnet/sys/boot/fdt/dts/arm/bcm2836.dtsi projects/vnet/sys/boot/fdt/dts/arm/cubieboard.dts projects/vnet/sys/boot/fdt/dts/arm/cubieboard2.dts projects/vnet/sys/boot/fdt/dts/arm/olimex-a20-som-evb.dts projects/vnet/sys/boot/fdt/dts/arm/olinuxino-lime.dts projects/vnet/sys/boot/fdt/dts/arm/sun7i-a20-hdmi.dtsi projects/vnet/sys/boot/forth/loader.conf.5 projects/vnet/sys/boot/geli/geliboot.c projects/vnet/sys/boot/geli/geliboot.h projects/vnet/sys/boot/i386/libi386/biosdisk.c projects/vnet/sys/boot/i386/zfsboot/zfsboot.c projects/vnet/sys/cam/scsi/scsi_ch.c projects/vnet/sys/cddl/compat/opensolaris/sys/vfs.h projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/vnet/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c projects/vnet/sys/compat/cloudabi64/cloudabi64_module.c projects/vnet/sys/compat/cloudabi64/cloudabi64_thread.c projects/vnet/sys/compat/cloudabi64/cloudabi64_util.h projects/vnet/sys/compat/linux/linux_misc.c projects/vnet/sys/conf/NOTES projects/vnet/sys/conf/files projects/vnet/sys/conf/files.amd64 projects/vnet/sys/conf/files.arm64 projects/vnet/sys/conf/files.i386 projects/vnet/sys/conf/files.pc98 projects/vnet/sys/conf/newvers.sh projects/vnet/sys/conf/options projects/vnet/sys/contrib/cloudabi/cloudabi64_types.h projects/vnet/sys/contrib/ipfilter/netinet/fil.c projects/vnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/vnet/sys/contrib/ipfilter/netinet/ip_frag.c projects/vnet/sys/contrib/ipfilter/netinet/ip_state.c projects/vnet/sys/dev/acpica/acpi_pci.c projects/vnet/sys/dev/ath/if_ath_rx.c projects/vnet/sys/dev/cardbus/cardbus.c projects/vnet/sys/dev/dwc/if_dwc.c projects/vnet/sys/dev/extres/clk/clk.c projects/vnet/sys/dev/fdc/fdc.c projects/vnet/sys/dev/flash/mx25l.c projects/vnet/sys/dev/flash/mx25lreg.h projects/vnet/sys/dev/hwpmc/hwpmc_e500.c projects/vnet/sys/dev/hyperv/vmbus/hv_channel.c projects/vnet/sys/dev/hyperv/vmbus/hv_channel_mgmt.c projects/vnet/sys/dev/hyperv/vmbus/hv_connection.c projects/vnet/sys/dev/hyperv/vmbus/hv_hv.c projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/vnet/sys/dev/iicbus/ds1307.c projects/vnet/sys/dev/iicbus/ds1307reg.h projects/vnet/sys/dev/iicbus/twsi/a10_twsi.c projects/vnet/sys/dev/isci/scil/scic_sds_controller_registers.h projects/vnet/sys/dev/isp/isp.c projects/vnet/sys/dev/iwn/if_iwn.c projects/vnet/sys/dev/kbdmux/kbdmux.c projects/vnet/sys/dev/pci/pci.c projects/vnet/sys/dev/pci/pci_iov.c projects/vnet/sys/dev/pci/pci_private.h projects/vnet/sys/dev/rt/if_rt.c projects/vnet/sys/dev/rt/if_rtvar.h projects/vnet/sys/dev/urtwn/if_urtwn.c projects/vnet/sys/dev/urtwn/if_urtwnvar.h projects/vnet/sys/dev/usb/controller/ehci_fsl.c projects/vnet/sys/dev/usb/controller/ehci_imx.c projects/vnet/sys/dev/usb/controller/musb_otg.c projects/vnet/sys/dev/usb/quirk/usb_quirk.c projects/vnet/sys/dev/usb/serial/uftdi.c projects/vnet/sys/dev/usb/usbdevs projects/vnet/sys/dev/usb/wlan/if_rsu.c projects/vnet/sys/dev/vnic/nicvf_queues.c projects/vnet/sys/dev/vnic/thunder_bgx.c projects/vnet/sys/dev/wpi/if_wpi.c projects/vnet/sys/dev/xen/blkfront/blkfront.c projects/vnet/sys/dev/xen/blkfront/block.h projects/vnet/sys/dev/xen/control/control.c projects/vnet/sys/dev/xen/pci/xen_acpi_pci.c projects/vnet/sys/fs/ext2fs/ext2_bmap.c projects/vnet/sys/fs/ext2fs/ext2_vfsops.c projects/vnet/sys/geom/eli/g_eli.c projects/vnet/sys/geom/eli/g_eli.h projects/vnet/sys/geom/eli/g_eli_ctl.c projects/vnet/sys/geom/sched/g_sched.c projects/vnet/sys/i386/linux/linux_sysvec.c projects/vnet/sys/kern/kern_physio.c projects/vnet/sys/kern/kern_racct.c projects/vnet/sys/kern/kern_rctl.c projects/vnet/sys/kern/link_elf_obj.c projects/vnet/sys/kern/pic_if.m projects/vnet/sys/kern/subr_intr.c projects/vnet/sys/kern/subr_smp.c projects/vnet/sys/kern/subr_trap.c projects/vnet/sys/kern/vfs_bio.c projects/vnet/sys/kern/vfs_cluster.c projects/vnet/sys/mips/mips/mips_pic.c projects/vnet/sys/mips/mips/nexus.c projects/vnet/sys/mips/mips/ofw_machdep.c projects/vnet/sys/modules/kbdmux/Makefile projects/vnet/sys/net/netisr.c projects/vnet/sys/net80211/ieee80211.c projects/vnet/sys/net80211/ieee80211_adhoc.c projects/vnet/sys/net80211/ieee80211_freebsd.h projects/vnet/sys/net80211/ieee80211_hostap.c projects/vnet/sys/net80211/ieee80211_ht.h projects/vnet/sys/net80211/ieee80211_ioctl.h projects/vnet/sys/net80211/ieee80211_node.c projects/vnet/sys/net80211/ieee80211_node.h projects/vnet/sys/net80211/ieee80211_output.c projects/vnet/sys/net80211/ieee80211_phy.c projects/vnet/sys/net80211/ieee80211_phy.h projects/vnet/sys/net80211/ieee80211_sta.c projects/vnet/sys/net80211/ieee80211_superg.c projects/vnet/sys/net80211/ieee80211_superg.h projects/vnet/sys/net80211/ieee80211_var.h projects/vnet/sys/netinet/sctp.h projects/vnet/sys/netinet/sctp_constants.h projects/vnet/sys/netinet/sctp_dtrace_define.h projects/vnet/sys/netinet/sctp_header.h projects/vnet/sys/netinet/sctp_indata.c projects/vnet/sys/netinet/sctp_indata.h projects/vnet/sys/netinet/sctp_input.c projects/vnet/sys/netinet/sctp_output.c projects/vnet/sys/netinet/sctp_pcb.c projects/vnet/sys/netinet/sctp_pcb.h projects/vnet/sys/netinet/sctp_structs.h projects/vnet/sys/netinet/sctp_uio.h projects/vnet/sys/netinet/sctp_usrreq.c projects/vnet/sys/netinet/sctp_var.h projects/vnet/sys/netinet/sctputil.c projects/vnet/sys/netinet/sctputil.h projects/vnet/sys/netinet/tcp_subr.c projects/vnet/sys/netinet/tcp_syncache.c projects/vnet/sys/netinet6/in6_src.c projects/vnet/sys/powerpc/mpc85xx/i2c.c projects/vnet/sys/powerpc/ofw/ofw_pcibus.c projects/vnet/sys/security/audit/audit_syscalls.c projects/vnet/sys/sparc64/pci/ofw_pcibus.c projects/vnet/sys/sys/elf_common.h projects/vnet/sys/sys/intr.h projects/vnet/sys/sys/param.h projects/vnet/sys/sys/proc.h projects/vnet/sys/sys/racct.h projects/vnet/sys/sys/rctl.h projects/vnet/sys/sys/smp.h projects/vnet/sys/ufs/ffs/ffs_inode.c projects/vnet/sys/ufs/ffs/ffs_softdep.c projects/vnet/sys/ufs/ufs/ufs_bmap.c projects/vnet/sys/vm/vm_fault.c projects/vnet/sys/x86/x86/local_apic.c projects/vnet/sys/x86/x86/mp_x86.c projects/vnet/sys/x86/xen/xen_apic.c projects/vnet/tools/tools/nanobsd/defaults.sh projects/vnet/tools/tools/nanobsd/nanobsd.sh projects/vnet/tools/tools/net80211/wlanstats/main.c projects/vnet/tools/tools/net80211/wlanstats/wlanstats.c projects/vnet/usr.bin/rctl/rctl.8 projects/vnet/usr.bin/sed/compile.c projects/vnet/usr.bin/uuencode/uuencode.1 projects/vnet/usr.bin/uuencode/uuencode.c projects/vnet/usr.bin/whois/whois.c projects/vnet/usr.sbin/bhyve/pci_ahci.c projects/vnet/usr.sbin/bhyveload/bhyveload.c projects/vnet/usr.sbin/bsdinstall/scripts/zfsboot projects/vnet/usr.sbin/etcupdate/tests/tzsetup_test.sh Directory Properties: projects/vnet/ (props changed) projects/vnet/cddl/ (props changed) projects/vnet/cddl/contrib/opensolaris/ (props changed) projects/vnet/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/vnet/lib/libc/ (props changed) projects/vnet/sbin/ (props changed) projects/vnet/share/ (props changed) projects/vnet/share/man/man4/ (props changed) projects/vnet/sys/ (props changed) projects/vnet/sys/boot/ (props changed) projects/vnet/sys/cddl/contrib/opensolaris/ (props changed) projects/vnet/sys/conf/ (props changed) projects/vnet/sys/contrib/ipfilter/ (props changed) projects/vnet/sys/dev/hyperv/ (props changed) projects/vnet/usr.sbin/bhyve/ (props changed) projects/vnet/usr.sbin/bhyveload/ (props changed) Modified: projects/vnet/Makefile.inc1 ============================================================================== --- projects/vnet/Makefile.inc1 Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/Makefile.inc1 Sat Apr 9 12:17:31 2016 (r297744) @@ -450,7 +450,7 @@ LIBCOMPAT= SOFT WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} -IMAKEENV= ${CROSSENV:N_LDSCRIPTROOT=*} +IMAKEENV= ${CROSSENV} IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 \ ${IMAKE_INSTALL} ${IMAKE_MTREE} .if empty(.MAKEFLAGS:M-n) Modified: projects/vnet/Makefile.libcompat ============================================================================== --- projects/vnet/Makefile.libcompat Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/Makefile.libcompat Sat Apr 9 12:17:31 2016 (r297744) @@ -97,7 +97,7 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCO MK_TESTS=no LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \ MK_MAN=no MK_HTML=no -LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \ +LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \ MK_TOOLCHAIN=no ${IMAKE_INSTALL} \ -DLIBRARIES_ONLY Modified: projects/vnet/bin/csh/config_p.h ============================================================================== --- projects/vnet/bin/csh/config_p.h Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/bin/csh/config_p.h Sat Apr 9 12:17:31 2016 (r297744) @@ -34,7 +34,8 @@ * Note that some machines eg. rs6000 have a vfork, but not * with the berkeley semantics, so we cannot use it there either. */ -#define VFORK +/* #define VFORK */ +#define vfork fork /* * BSDJOBS You have BSD-style job control (both process groups and @@ -80,7 +81,6 @@ /****************** local defines *********************/ #if defined(__FreeBSD__) -#define SAVESIGVEC #define NLS_BUGS #define BSD_STYLE_COLORLS /* Use LC_MESSAGES locale category to open the message catalog */ Modified: projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sat Apr 9 12:17:31 2016 (r297744) @@ -1633,8 +1633,9 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvl * its canmount property to 'on' or 'noauto'. We only use * the changelist logic to unmount when setting canmount=off. */ - if (!(prop == ZFS_PROP_CANMOUNT && - fnvpair_value_uint64(elem) != ZFS_CANMOUNT_OFF)) { + if (prop != ZFS_PROP_CANMOUNT || + (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF && + zfs_is_mounted(zhp, NULL))) { cls[cl_idx] = changelist_gather(zhp, prop, 0, 0); if (cls[cl_idx] == NULL) goto error; Modified: projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sat Apr 9 12:17:31 2016 (r297744) @@ -3479,7 +3479,8 @@ zfs_receive_one(libzfs_handle_t *hdl, in } if (clp) { - err |= changelist_postfix(clp); + if (!flags->nomount) + err |= changelist_postfix(clp); changelist_free(clp); } Modified: projects/vnet/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c ============================================================================== --- projects/vnet/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c Sat Apr 9 12:17:31 2016 (r297744) @@ -46,9 +46,11 @@ ATF_TC_HEAD(gettimeofday_err, tc) ATF_TC_BODY(gettimeofday_err, tc) { +#ifdef __NetBSD__ errno = 0; ATF_REQUIRE_ERRNO(EFAULT, gettimeofday((void *)-1, NULL) != 0); +#endif } ATF_TC(gettimeofday_mono); Modified: projects/vnet/lib/libc/aarch64/gen/Makefile.inc ============================================================================== --- projects/vnet/lib/libc/aarch64/gen/Makefile.inc Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libc/aarch64/gen/Makefile.inc Sat Apr 9 12:17:31 2016 (r297744) @@ -1,5 +1,7 @@ # $FreeBSD$ +CFLAGS+= -DNO_COMPAT7 + SRCS+= _ctx_start.S \ fabs.S \ flt_rounds.c \ Modified: projects/vnet/lib/libc/aarch64/sys/Makefile.inc ============================================================================== --- projects/vnet/lib/libc/aarch64/sys/Makefile.inc Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libc/aarch64/sys/Makefile.inc Sat Apr 9 12:17:31 2016 (r297744) @@ -1,5 +1,7 @@ # $FreeBSD$ +MIASM:= ${MIASM:Nfreebsd[467]_*} + SRCS+= __vdso_gettc.c #MDASM= ptrace.S Modified: projects/vnet/lib/libc/db/hash/hash.c ============================================================================== --- projects/vnet/lib/libc/db/hash/hash.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libc/db/hash/hash.c Sat Apr 9 12:17:31 2016 (r297744) @@ -423,7 +423,8 @@ hdestroy(HTAB *hashp) free(hashp->tmp_buf); if (hashp->fp != -1) { - (void)_fsync(hashp->fp); + if (hashp->save_file) + (void)_fsync(hashp->fp); (void)_close(hashp->fp); } Modified: projects/vnet/lib/libc/gen/semctl.c ============================================================================== --- projects/vnet/lib/libc/gen/semctl.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libc/gen/semctl.c Sat Apr 9 12:17:31 2016 (r297744) @@ -29,7 +29,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#ifndef NO_COMPAT7 #define _WANT_SEMUN_OLD +#endif #include <sys/types.h> #include <sys/ipc.h> @@ -38,8 +40,10 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> int __semctl(int semid, int semnum, int cmd, union semun *arg); +#ifndef NO_COMPAT7 int freebsd7___semctl(int semid, int semnum, int cmd, union semun_old *arg); int freebsd7_semctl(int semid, int semnum, int cmd, ...); +#endif int semctl(int semid, int semnum, int cmd, ...) @@ -61,6 +65,7 @@ semctl(int semid, int semnum, int cmd, . return (__semctl(semid, semnum, cmd, semun_ptr)); } +#ifndef NO_COMPAT7 int freebsd7_semctl(int semid, int semnum, int cmd, ...) { @@ -82,3 +87,4 @@ freebsd7_semctl(int semid, int semnum, i } __sym_compat(semctl, freebsd7_semctl, FBSD_1.0); +#endif Modified: projects/vnet/lib/libc/include/compat.h ============================================================================== --- projects/vnet/lib/libc/include/compat.h Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libc/include/compat.h Sat Apr 9 12:17:31 2016 (r297744) @@ -38,9 +38,11 @@ #define __sym_compat(sym,impl,verid) \ .symver impl, sym@verid +#ifndef NO_COMPAT7 __sym_compat(__semctl, freebsd7___semctl, FBSD_1.0); __sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0); __sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0); +#endif #undef __sym_compat Modified: projects/vnet/lib/libc/locale/euc.c ============================================================================== --- projects/vnet/lib/libc/locale/euc.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libc/locale/euc.c Sat Apr 9 12:17:31 2016 (r297744) @@ -132,7 +132,7 @@ _EUC_CN_init(struct xlocale_ctype *l, _R l->runes = rl; l->__mb_cur_max = 4; - l->__mb_sb_limit = 256; + l->__mb_sb_limit = 128; return (0); } @@ -226,7 +226,7 @@ _EUC_JP_init(struct xlocale_ctype *l, _R l->runes = rl; l->__mb_cur_max = 3; - l->__mb_sb_limit = 196; + l->__mb_sb_limit = 128; return (0); } @@ -273,7 +273,7 @@ _EUC_TW_init(struct xlocale_ctype *l, _R l->runes = rl; l->__mb_cur_max = 4; - l->__mb_sb_limit = 256; + l->__mb_sb_limit = 128; return (0); } Modified: projects/vnet/lib/libc/locale/mskanji.c ============================================================================== --- projects/vnet/lib/libc/locale/mskanji.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libc/locale/mskanji.c Sat Apr 9 12:17:31 2016 (r297744) @@ -83,7 +83,7 @@ _MSKanji_init(struct xlocale_ctype *l, _ l->__mbsinit = _MSKanji_mbsinit; l->runes = rl; l->__mb_cur_max = 2; - l->__mb_sb_limit = 256; + l->__mb_sb_limit = 224; return (0); } Modified: projects/vnet/lib/libthr/thread/thr_affinity.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_affinity.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_affinity.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread_np.h> #include <sys/param.h> Modified: projects/vnet/lib/libthr/thread/thr_attr.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_attr.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_attr.c Sat Apr 9 12:17:31 2016 (r297744) @@ -89,10 +89,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <pthread.h> Modified: projects/vnet/lib/libthr/thread/thr_autoinit.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_autoinit.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_autoinit.c Sat Apr 9 12:17:31 2016 (r297744) @@ -29,10 +29,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <pthread.h> #include "thr_private.h" Modified: projects/vnet/lib/libthr/thread/thr_barrier.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_barrier.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_barrier.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <stdlib.h> @@ -34,6 +35,9 @@ #include "thr_private.h" +_Static_assert(sizeof(struct pthread_barrier) <= PAGE_SIZE, + "pthread_barrier is too large for off-page"); + __weak_reference(_pthread_barrier_init, pthread_barrier_init); __weak_reference(_pthread_barrier_wait, pthread_barrier_wait); __weak_reference(_pthread_barrier_destroy, pthread_barrier_destroy); Modified: projects/vnet/lib/libthr/thread/thr_barrierattr.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_barrierattr.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_barrierattr.c Sat Apr 9 12:17:31 2016 (r297744) @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <stdlib.h> Modified: projects/vnet/lib/libthr/thread/thr_cancel.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_cancel.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_cancel.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include "un-namespace.h" Modified: projects/vnet/lib/libthr/thread/thr_clean.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_clean.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_clean.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <signal.h> #include <errno.h> Modified: projects/vnet/lib/libthr/thread/thr_concurrency.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_concurrency.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_concurrency.c Sat Apr 9 12:17:31 2016 (r297744) @@ -28,10 +28,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <pthread.h> Modified: projects/vnet/lib/libthr/thread/thr_cond.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_cond.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_cond.c Sat Apr 9 12:17:31 2016 (r297744) @@ -26,10 +26,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <stdlib.h> #include <errno.h> @@ -40,6 +41,9 @@ #include "thr_private.h" +_Static_assert(sizeof(struct pthread_cond) <= PAGE_SIZE, + "pthread_cond too large"); + /* * Prototypes */ Modified: projects/vnet/lib/libthr/thread/thr_condattr.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_condattr.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_condattr.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <stdlib.h> #include <string.h> Modified: projects/vnet/lib/libthr/thread/thr_create.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_create.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_create.c Sat Apr 9 12:17:31 2016 (r297744) @@ -23,10 +23,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <sys/rtprio.h> Modified: projects/vnet/lib/libthr/thread/thr_detach.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_detach.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_detach.c Sat Apr 9 12:17:31 2016 (r297744) @@ -23,11 +23,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <errno.h> Modified: projects/vnet/lib/libthr/thread/thr_equal.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_equal.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_equal.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,9 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include "un-namespace.h" Modified: projects/vnet/lib/libthr/thread/thr_event.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_event.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_event.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "thr_private.h" void Modified: projects/vnet/lib/libthr/thread/thr_exit.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_exit.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_exit.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #ifdef _PTHREAD_FORCED_UNWIND Modified: projects/vnet/lib/libthr/thread/thr_fork.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_fork.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_fork.c Sat Apr 9 12:17:31 2016 (r297744) @@ -23,8 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -57,6 +55,9 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/syscall.h> #include "namespace.h" #include <errno.h> Modified: projects/vnet/lib/libthr/thread/thr_getcpuclockid.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_getcpuclockid.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_getcpuclockid.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <pthread.h> Modified: projects/vnet/lib/libthr/thread/thr_getprio.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_getprio.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_getprio.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,9 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <pthread.h> Modified: projects/vnet/lib/libthr/thread/thr_getschedparam.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_getschedparam.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_getschedparam.c Sat Apr 9 12:17:31 2016 (r297744) @@ -28,10 +28,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <sys/rtprio.h> Modified: projects/vnet/lib/libthr/thread/thr_getthreadid_np.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_getthreadid_np.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_getthreadid_np.c Sat Apr 9 12:17:31 2016 (r297744) @@ -21,10 +21,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include <pthread_np.h> Modified: projects/vnet/lib/libthr/thread/thr_info.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_info.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_info.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <stdlib.h> #include <string.h> Modified: projects/vnet/lib/libthr/thread/thr_init.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_init.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_init.c Sat Apr 9 12:17:31 2016 (r297744) @@ -29,10 +29,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <sys/signalvar.h> @@ -108,7 +109,6 @@ struct pthread_cond_attr _pthread_condat .c_clockid = CLOCK_REALTIME }; -pid_t _thr_pid; int _thr_is_smp = 0; size_t _thr_guard_default; size_t _thr_stack_default = THR_STACK_DEFAULT; Modified: projects/vnet/lib/libthr/thread/thr_join.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_join.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_join.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <pthread.h> Modified: projects/vnet/lib/libthr/thread/thr_kern.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_kern.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_kern.c Sat Apr 9 12:17:31 2016 (r297744) @@ -23,10 +23,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/signalvar.h> #include <sys/rtprio.h> Modified: projects/vnet/lib/libthr/thread/thr_kill.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_kill.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_kill.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <signal.h> Modified: projects/vnet/lib/libthr/thread/thr_list.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_list.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_list.c Sat Apr 9 12:17:31 2016 (r297744) @@ -23,10 +23,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/queue.h> Modified: projects/vnet/lib/libthr/thread/thr_main_np.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_main_np.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_main_np.c Sat Apr 9 12:17:31 2016 (r297744) @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include <pthread_np.h> @@ -37,10 +38,10 @@ __weak_reference(_pthread_main_np, pthread_main_np); /* - * Provide the equivelant to Solaris thr_main() function + * Provide the equivalent to Solaris thr_main() function. */ int -_pthread_main_np() +_pthread_main_np(void) { if (!_thr_initial) Modified: projects/vnet/lib/libthr/thread/thr_multi_np.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_multi_np.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_multi_np.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include <pthread_np.h> @@ -37,7 +38,7 @@ __weak_reference(_pthread_multi_np, pthread_multi_np); int -_pthread_multi_np() +_pthread_multi_np(void) { /* Return to multi-threaded scheduling mode: */ Modified: projects/vnet/lib/libthr/thread/thr_mutex.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_mutex.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_mutex.c Sat Apr 9 12:17:31 2016 (r297744) @@ -34,10 +34,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdbool.h> #include "namespace.h" #include <stdlib.h> @@ -51,6 +52,9 @@ #include "thr_private.h" +_Static_assert(sizeof(struct pthread_mutex) <= PAGE_SIZE, + "pthread_mutex is too large for off-page"); + /* * For adaptive mutexes, how many times to spin doing trylock2 * before entering the kernel to block Modified: projects/vnet/lib/libthr/thread/thr_mutexattr.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_mutexattr.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_mutexattr.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -59,6 +57,9 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <string.h> #include <stdlib.h> Modified: projects/vnet/lib/libthr/thread/thr_once.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_once.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_once.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include "un-namespace.h" Modified: projects/vnet/lib/libthr/thread/thr_printf.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_printf.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_printf.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdarg.h> #include <string.h> #include <unistd.h> Modified: projects/vnet/lib/libthr/thread/thr_private.h ============================================================================== --- projects/vnet/lib/libthr/thread/thr_private.h Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_private.h Sat Apr 9 12:17:31 2016 (r297744) @@ -725,7 +725,6 @@ extern struct pthread_cond_attr _pthread extern struct pthread_prio _thr_priorities[] __hidden; -extern pid_t _thr_pid __hidden; extern int _thr_is_smp __hidden; extern size_t _thr_guard_default __hidden; Modified: projects/vnet/lib/libthr/thread/thr_pspinlock.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_pspinlock.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_pspinlock.c Sat Apr 9 12:17:31 2016 (r297744) @@ -26,10 +26,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <stdlib.h> @@ -38,6 +39,9 @@ #include "thr_private.h" +_Static_assert(sizeof(struct pthread_spinlock) <= PAGE_SIZE, + "pthread_spinlock is too large for off-page"); + #define SPIN_COUNT 100000 __weak_reference(_pthread_spin_init, pthread_spin_init); Modified: projects/vnet/lib/libthr/thread/thr_resume_np.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_resume_np.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_resume_np.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <pthread.h> Modified: projects/vnet/lib/libthr/thread/thr_rtld.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_rtld.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_rtld.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * A lockless rwlock for rtld. */ Modified: projects/vnet/lib/libthr/thread/thr_rwlock.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_rwlock.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_rwlock.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <errno.h> #include <limits.h> #include <stdlib.h> @@ -35,6 +36,9 @@ #include "un-namespace.h" #include "thr_private.h" +_Static_assert(sizeof(struct pthread_rwlock) <= PAGE_SIZE, + "pthread_rwlock is too large for off-page"); + __weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy); __weak_reference(_pthread_rwlock_init, pthread_rwlock_init); __weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock); Modified: projects/vnet/lib/libthr/thread/thr_rwlockattr.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_rwlockattr.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_rwlockattr.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <errno.h> #include <stdlib.h> Modified: projects/vnet/lib/libthr/thread/thr_self.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_self.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_self.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include "un-namespace.h" Modified: projects/vnet/lib/libthr/thread/thr_sem.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_sem.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_sem.c Sat Apr 9 12:17:31 2016 (r297744) @@ -26,10 +26,11 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <sys/queue.h> Modified: projects/vnet/lib/libthr/thread/thr_setprio.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_setprio.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_setprio.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include "un-namespace.h" Modified: projects/vnet/lib/libthr/thread/thr_setschedparam.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_setschedparam.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_setschedparam.c Sat Apr 9 12:17:31 2016 (r297744) @@ -28,10 +28,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/param.h> #include <errno.h> Modified: projects/vnet/lib/libthr/thread/thr_sig.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_sig.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_sig.c Sat Apr 9 12:17:31 2016 (r297744) @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/param.h> #include <sys/types.h> Modified: projects/vnet/lib/libthr/thread/thr_single_np.c ============================================================================== --- projects/vnet/lib/libthr/thread/thr_single_np.c Sat Apr 9 12:13:45 2016 (r297743) +++ projects/vnet/lib/libthr/thread/thr_single_np.c Sat Apr 9 12:17:31 2016 (r297744) @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <pthread.h> #include <pthread_np.h> @@ -36,7 +37,8 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604091217.u39CHV1f044516>