svn commit: r258795 - in projects/sendfile: . bin/sh lib lib/libc/sparc64/fpu lib/libc/sys lib/libc/xdr lib/libpjdlog release sbin share/man/man4 share/mk sys/amd64/conf sys/amd64/pci sys/amd64/vmm...

Gleb Smirnoff glebius at FreeBSD.org
Sun Dec 1 14:03:16 UTC 2013 

Author: glebius
Date: Sun Dec  1 14:03:03 2013
New Revision: 258795
URL: http://svnweb.freebsd.org/changeset/base/258795

Log:
  Merge head.

Added:
  projects/sendfile/lib/libpjdlog/
     - copied from r258794, head/lib/libpjdlog/
  projects/sendfile/sys/sys/sf_sync.h
     - copied unchanged from r258794, head/sys/sys/sf_sync.h
Modified:
  projects/sendfile/Makefile.inc1
  projects/sendfile/bin/sh/cd.c
  projects/sendfile/bin/sh/exec.c
  projects/sendfile/bin/sh/expand.c
  projects/sendfile/bin/sh/memalloc.c
  projects/sendfile/bin/sh/mystring.c
  projects/sendfile/bin/sh/mystring.h
  projects/sendfile/bin/sh/show.c
  projects/sendfile/bin/sh/var.c
  projects/sendfile/lib/Makefile
  projects/sendfile/lib/libc/sparc64/fpu/fpu.c
  projects/sendfile/lib/libc/sparc64/fpu/fpu_sqrt.c
  projects/sendfile/lib/libc/sys/chmod.2
  projects/sendfile/lib/libc/sys/pdfork.2
  projects/sendfile/lib/libc/sys/wait.2
  projects/sendfile/lib/libc/xdr/xdr_rec.c
  projects/sendfile/release/Makefile
  projects/sendfile/release/release.sh
  projects/sendfile/sbin/Makefile
  projects/sendfile/share/man/man4/capsicum.4
  projects/sendfile/share/man/man4/procdesc.4
  projects/sendfile/share/mk/bsd.libnames.mk
  projects/sendfile/sys/amd64/conf/GENERIC
  projects/sendfile/sys/amd64/pci/pci_cfgreg.c
  projects/sendfile/sys/amd64/vmm/intel/vmcs.h
  projects/sendfile/sys/amd64/vmm/intel/vmx_controls.h
  projects/sendfile/sys/amd64/vmm/intel/vtd.c
  projects/sendfile/sys/arm/arm/db_trace.c
  projects/sendfile/sys/arm/arm/pl190.c
  projects/sendfile/sys/arm/at91/if_macbvar.h
  projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_dma.c
  projects/sendfile/sys/arm/econa/if_ece.c
  projects/sendfile/sys/arm/freescale/imx/imx6_anatopreg.h
  projects/sendfile/sys/arm/freescale/imx/imx6_usbphy.c
  projects/sendfile/sys/arm/freescale/imx/imx_gptreg.h
  projects/sendfile/sys/arm/freescale/vybrid/vf_anadig.c
  projects/sendfile/sys/arm/freescale/vybrid/vf_ccm.c
  projects/sendfile/sys/arm/freescale/vybrid/vf_ehci.c
  projects/sendfile/sys/arm/include/armreg.h
  projects/sendfile/sys/arm/lpc/if_lpereg.h
  projects/sendfile/sys/arm/lpc/lpcreg.h
  projects/sendfile/sys/arm/mv/mv_pci.c
  projects/sendfile/sys/arm/samsung/exynos/ehci_exynos5.c
  projects/sendfile/sys/arm/xscale/i8134x/i81342reg.h
  projects/sendfile/sys/arm/xscale/ixp425/ixp425reg.h
  projects/sendfile/sys/boot/arm/at91/libat91/mci_device.h
  projects/sendfile/sys/boot/i386/libfirewire/fwohci.h
  projects/sendfile/sys/boot/i386/libfirewire/fwohcireg.h
  projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c
  projects/sendfile/sys/conf/NOTES
  projects/sendfile/sys/conf/options
  projects/sendfile/sys/dev/aac/aacvar.h
  projects/sendfile/sys/dev/acpica/acpi_video.c
  projects/sendfile/sys/dev/agp/agp_i810.c
  projects/sendfile/sys/dev/ahci/ahci.h
  projects/sendfile/sys/dev/bktr/bktr_core.c
  projects/sendfile/sys/dev/cesa/cesa.h
  projects/sendfile/sys/dev/drm/i915_reg.h
  projects/sendfile/sys/dev/drm/mach64_drv.h
  projects/sendfile/sys/dev/drm/mga_drv.h
  projects/sendfile/sys/dev/drm/r128_drv.h
  projects/sendfile/sys/dev/drm/r300_reg.h
  projects/sendfile/sys/dev/drm/r600_blit.c
  projects/sendfile/sys/dev/drm/radeon_cp.c
  projects/sendfile/sys/dev/drm/radeon_drv.h
  projects/sendfile/sys/dev/drm/via_irq.c
  projects/sendfile/sys/dev/drm2/i915/i915_reg.h
  projects/sendfile/sys/dev/drm2/radeon/evergreen_blit_kms.c
  projects/sendfile/sys/dev/drm2/radeon/evergreen_cs.c
  projects/sendfile/sys/dev/drm2/radeon/evergreend.h
  projects/sendfile/sys/dev/drm2/radeon/nid.h
  projects/sendfile/sys/dev/drm2/radeon/r200.c
  projects/sendfile/sys/dev/drm2/radeon/r300.c
  projects/sendfile/sys/dev/drm2/radeon/r300_reg.h
  projects/sendfile/sys/dev/drm2/radeon/r500_reg.h
  projects/sendfile/sys/dev/drm2/radeon/r600_blit.c
  projects/sendfile/sys/dev/drm2/radeon/r600_blit_kms.c
  projects/sendfile/sys/dev/drm2/radeon/r600_cs.c
  projects/sendfile/sys/dev/drm2/radeon/r600d.h
  projects/sendfile/sys/dev/drm2/radeon/radeon_cp.c
  projects/sendfile/sys/dev/drm2/radeon/radeon_drv.h
  projects/sendfile/sys/dev/drm2/radeon/radeon_reg.h
  projects/sendfile/sys/dev/drm2/radeon/rv770d.h
  projects/sendfile/sys/dev/drm2/radeon/sid.h
  projects/sendfile/sys/dev/drm2/ttm/ttm_bo.c
  projects/sendfile/sys/dev/e1000/e1000_82575.h
  projects/sendfile/sys/dev/e1000/e1000_ich8lan.c
  projects/sendfile/sys/dev/e1000/e1000_regs.h
  projects/sendfile/sys/dev/etherswitch/arswitch/arswitchreg.h
  projects/sendfile/sys/dev/ffec/if_ffecreg.h
  projects/sendfile/sys/dev/firewire/firewire.c
  projects/sendfile/sys/dev/firewire/fwohci.c
  projects/sendfile/sys/dev/firewire/fwohcireg.h
  projects/sendfile/sys/dev/firewire/sbp.c
  projects/sendfile/sys/dev/firewire/sbp.h
  projects/sendfile/sys/dev/firewire/sbp_targ.c
  projects/sendfile/sys/dev/hatm/if_hatmreg.h
  projects/sendfile/sys/dev/hwpmc/hwpmc_piv.h
  projects/sendfile/sys/dev/iscsi/iscsi.c
  projects/sendfile/sys/dev/iwn/if_iwnreg.h
  projects/sendfile/sys/dev/mge/if_mgevar.h
  projects/sendfile/sys/dev/mpt/mpt_cam.c
  projects/sendfile/sys/dev/msk/if_mskreg.h
  projects/sendfile/sys/dev/mvs/mvs.h
  projects/sendfile/sys/dev/mxge/mxge_mcp.h
  projects/sendfile/sys/dev/qlxge/qls_dump.c
  projects/sendfile/sys/dev/ral/rt2560reg.h
  projects/sendfile/sys/dev/ral/rt2661reg.h
  projects/sendfile/sys/dev/ral/rt2860reg.h
  projects/sendfile/sys/dev/sound/pci/hda/hdaa.h
  projects/sendfile/sys/dev/usb/controller/ehci.h
  projects/sendfile/sys/dev/usb/wlan/if_rumreg.h
  projects/sendfile/sys/dev/usb/wlan/if_runreg.h
  projects/sendfile/sys/dev/usb/wlan/if_uralreg.h
  projects/sendfile/sys/dev/usb/wlan/if_urtwreg.h
  projects/sendfile/sys/dev/usb/wlan/if_zydreg.h
  projects/sendfile/sys/dev/wpi/if_wpireg.h
  projects/sendfile/sys/geom/raid/tr_raid1e.c
  projects/sendfile/sys/i386/conf/GENERIC
  projects/sendfile/sys/i386/pci/pci_cfgreg.c
  projects/sendfile/sys/ia64/conf/GENERIC
  projects/sendfile/sys/kern/kern_descrip.c
  projects/sendfile/sys/kern/kern_exit.c
  projects/sendfile/sys/kern/kern_fork.c
  projects/sendfile/sys/kern/kern_sig.c
  projects/sendfile/sys/kern/sys_procdesc.c
  projects/sendfile/sys/kern/uipc_syscalls.c
  projects/sendfile/sys/mips/atheros/ar71xxreg.h
  projects/sendfile/sys/mips/atheros/ar934xreg.h
  projects/sendfile/sys/mips/atheros/if_argevar.h
  projects/sendfile/sys/mips/malta/gt_pci.c
  projects/sendfile/sys/mips/nlm/dev/net/nae.c
  projects/sendfile/sys/mips/nlm/xlp_machdep.c
  projects/sendfile/sys/mips/rmi/pic.h
  projects/sendfile/sys/netinet/sctp_bsd_addr.c
  projects/sendfile/sys/netinet/sctp_pcb.c
  projects/sendfile/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
  projects/sendfile/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c
  projects/sendfile/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c
  projects/sendfile/sys/ofed/drivers/net/mlx4/mcg.c
  projects/sendfile/sys/pc98/conf/GENERIC
  projects/sendfile/sys/powerpc/conf/GENERIC
  projects/sendfile/sys/powerpc/fpu/fpu_emu.c
  projects/sendfile/sys/powerpc/fpu/fpu_sqrt.c
  projects/sendfile/sys/powerpc/ofw/ofw_machdep.c
  projects/sendfile/sys/powerpc/powermac/nvbl.c
  projects/sendfile/sys/sparc64/conf/GENERIC
  projects/sendfile/sys/sys/consio.h
  projects/sendfile/sys/sys/file.h
  projects/sendfile/sys/ufs/ffs/ffs_softdep.c
  projects/sendfile/sys/x86/iommu/intel_reg.h
  projects/sendfile/usr.sbin/bluetooth/bthidd/kbd.c
  projects/sendfile/usr.sbin/bsdconfig/includes/includes
  projects/sendfile/usr.sbin/rwhod/rwhod.c
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/amd64/vmm/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/conf/   (props changed)

Modified: projects/sendfile/Makefile.inc1
==============================================================================
--- projects/sendfile/Makefile.inc1	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/Makefile.inc1	Sun Dec  1 14:03:03 2013	(r258795)
@@ -1505,7 +1505,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/libradius lib/libsbuf lib/libtacplus \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libzfs_core} \
-		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
+		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
@@ -1521,6 +1521,8 @@ _lib_libthr=	lib/libthr
 _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
+lib/libpjdlog__L: lib/libutil__L
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)

Modified: projects/sendfile/bin/sh/cd.c
==============================================================================
--- projects/sendfile/bin/sh/cd.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/cd.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -182,6 +182,7 @@ cdlogical(char *dest)
 	struct stat statb;
 	int first;
 	int badstat;
+	size_t len;
 
 	/*
 	 *  Check each component of the path. If we find a symlink or
@@ -189,8 +190,9 @@ cdlogical(char *dest)
 	 *  next time we get the value of the current directory.
 	 */
 	badstat = 0;
-	cdcomppath = stalloc(strlen(dest) + 1);
-	scopy(dest, cdcomppath);
+	len = strlen(dest);
+	cdcomppath = stalloc(len + 1);
+	memcpy(cdcomppath, dest, len + 1);
 	STARTSTACKSTR(p);
 	if (*dest == '/') {
 		STPUTC('/', p);
@@ -275,6 +277,7 @@ findcwd(char *dir)
 {
 	char *new;
 	char *p;
+	size_t len;
 
 	/*
 	 * If our argument is NULL, we don't know the current directory
@@ -283,8 +286,9 @@ findcwd(char *dir)
 	 */
 	if (dir == NULL || curdir == NULL)
 		return getpwd2();
-	cdcomppath = stalloc(strlen(dir) + 1);
-	scopy(dir, cdcomppath);
+	len = strlen(dir);
+	cdcomppath = stalloc(len + 1);
+	memcpy(cdcomppath, dir, len + 1);
 	STARTSTACKSTR(new);
 	if (*dir != '/') {
 		STPUTS(curdir, new);

Modified: projects/sendfile/bin/sh/exec.c
==============================================================================
--- projects/sendfile/bin/sh/exec.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/exec.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -187,14 +187,15 @@ padvance(const char **path, const char *
 {
 	const char *p, *start;
 	char *q;
-	size_t len;
+	size_t len, namelen;
 
 	if (*path == NULL)
 		return NULL;
 	start = *path;
 	for (p = start; *p && *p != ':' && *p != '%'; p++)
 		; /* nothing */
-	len = p - start + strlen(name) + 2;	/* "2" is for '/' and '\0' */
+	namelen = strlen(name);
+	len = p - start + namelen + 2;	/* "2" is for '/' and '\0' */
 	STARTSTACKSTR(q);
 	CHECKSTRSPACE(len, q);
 	if (p != start) {
@@ -202,7 +203,7 @@ padvance(const char **path, const char *
 		q += p - start;
 		*q++ = '/';
 	}
-	strcpy(q, name);
+	memcpy(q, name, namelen + 1);
 	pathopt = NULL;
 	if (*p == '%') {
 		pathopt = ++p;
@@ -527,6 +528,7 @@ cmdlookup(const char *name, int add)
 	const char *p;
 	struct tblentry *cmdp;
 	struct tblentry **pp;
+	size_t len;
 
 	p = name;
 	hashval = *p << 4;
@@ -541,11 +543,11 @@ cmdlookup(const char *name, int add)
 	}
 	if (add && cmdp == NULL) {
 		INTOFF;
-		cmdp = *pp = ckmalloc(sizeof (struct tblentry)
-					+ strlen(name) + 1);
+		len = strlen(name);
+		cmdp = *pp = ckmalloc(sizeof (struct tblentry) + len + 1);
 		cmdp->next = NULL;
 		cmdp->cmdtype = CMDUNKNOWN;
-		strcpy(cmdp->cmdname, name);
+		memcpy(cmdp->cmdname, name, len + 1);
 		INTON;
 	}
 	lastcmdentry = pp;

Modified: projects/sendfile/bin/sh/expand.c
==============================================================================
--- projects/sendfile/bin/sh/expand.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/expand.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -1307,9 +1307,11 @@ addfname(char *name)
 {
 	char *p;
 	struct strlist *sp;
+	size_t len;
 
-	p = stalloc(strlen(name) + 1);
-	scopy(name, p);
+	len = strlen(name);
+	p = stalloc(len + 1);
+	memcpy(p, name, len + 1);
 	sp = (struct strlist *)stalloc(sizeof *sp);
 	sp->text = p;
 	*exparg.lastp = sp;

Modified: projects/sendfile/bin/sh/memalloc.c
==============================================================================
--- projects/sendfile/bin/sh/memalloc.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/memalloc.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -98,9 +98,11 @@ char *
 savestr(const char *s)
 {
 	char *p;
+	size_t len;
 
-	p = ckmalloc(strlen(s) + 1);
-	scopy(s, p);
+	len = strlen(s);
+	p = ckmalloc(len + 1);
+	memcpy(p, s, len + 1);
 	return p;
 }
 

Modified: projects/sendfile/bin/sh/mystring.c
==============================================================================
--- projects/sendfile/bin/sh/mystring.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/mystring.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
  * String functions.
  *
  *	equal(s1, s2)		Return true if strings are equal.
- *	scopy(from, to)		Copy a string.
  *	number(s)		Convert a string of digits to an integer.
  *	is_number(s)		Return true if s is a string of digits.
  */
@@ -60,10 +59,6 @@ char nullstr[1];		/* zero length string 
  * equal - #defined in mystring.h
  */
 
-/*
- * scopy - #defined in mystring.h
- */
-
 
 /*
  * prefix -- see if pfx is a prefix of string.

Modified: projects/sendfile/bin/sh/mystring.h
==============================================================================
--- projects/sendfile/bin/sh/mystring.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/mystring.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -40,4 +40,3 @@ int number(const char *);
 int is_number(const char *);
 
 #define equal(s1, s2)	(strcmp(s1, s2) == 0)
-#define scopy(s1, s2)	((void)strcpy(s2, s1))

Modified: projects/sendfile/bin/sh/show.c
==============================================================================
--- projects/sendfile/bin/sh/show.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/show.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -390,11 +390,11 @@ opentrace(void)
 			else
 				p = "/tmp";
 		}
-		scopy(p, s);
+		strcpy(s, p);
 		strcat(s, "/trace");
 	}
 #else
-	scopy("./trace", s);
+	strcpy(s, "./trace");
 #endif /* not_this_way */
 	if ((tracefile = fopen(s, "a")) == NULL) {
 		fprintf(stderr, "Can't open %s: %s\n", s, strerror(errno));

Modified: projects/sendfile/bin/sh/var.c
==============================================================================
--- projects/sendfile/bin/sh/var.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/bin/sh/var.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -224,8 +224,9 @@ void
 setvar(const char *name, const char *val, int flags)
 {
 	const char *p;
-	int len;
-	int namelen;
+	size_t len;
+	size_t namelen;
+	size_t vallen;
 	char *nameeq;
 	int isbad;
 
@@ -244,18 +245,20 @@ setvar(const char *name, const char *val
 	}
 	namelen = p - name;
 	if (isbad)
-		error("%.*s: bad variable name", namelen, name);
+		error("%.*s: bad variable name", (int)namelen, name);
 	len = namelen + 2;		/* 2 is space for '=' and '\0' */
 	if (val == NULL) {
 		flags |= VUNSET;
+		vallen = 0;
 	} else {
-		len += strlen(val);
+		vallen = strlen(val);
+		len += vallen;
 	}
 	nameeq = ckmalloc(len);
 	memcpy(nameeq, name, namelen);
 	nameeq[namelen] = '=';
 	if (val)
-		scopy(val, nameeq + namelen + 1);
+		memcpy(nameeq + namelen + 1, val, vallen + 1);
 	else
 		nameeq[namelen + 1] = '\0';
 	setvareq(nameeq, flags);

Modified: projects/sendfile/lib/Makefile
==============================================================================
--- projects/sendfile/lib/Makefile	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/lib/Makefile	Sun Dec  1 14:03:03 2013	(r258795)
@@ -35,6 +35,8 @@ SUBDIR_ORDERED=	${_csu} \
 	libc_nonshared \
 	libbsm \
 	libauditd \
+	libutil \
+	libpjdlog \
 	libcompiler_rt \
 	libcrypt \
 	libelf \
@@ -49,7 +51,6 @@ SUBDIR_ORDERED=	${_csu} \
 	librpcsvc \
 	libsbuf \
 	libtacplus \
-	libutil \
 	${_libypclnt} \
 	${_libcxxrt} \
 	${_libcplusplus}

Modified: projects/sendfile/lib/libc/sparc64/fpu/fpu.c
==============================================================================
--- projects/sendfile/lib/libc/sparc64/fpu/fpu.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/lib/libc/sparc64/fpu/fpu.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -202,7 +202,7 @@ static const int opmask[] = {0, 0, 1, 3,
  * Implement a move operation for all supported operand types. The additional
  * nand and xor parameters will be applied to the upper 32 bit word of the
  * source operand. This allows to implement fabs and fneg (for fp operands
- * only!) using this functions, too, by passing (1 << 31) for one of the
+ * only!) using this functions, too, by passing (1U << 31) for one of the
  * parameters, and 0 for the other.
  */
 static void
@@ -358,10 +358,10 @@ __fpu_execute(struct utrapframe *uf, str
 		__fpu_mov(fe, type, rd, rs2, 0, 0);
 		return (0);
 	case FOP(INS2_FPop1, INSFP1_FNEG):
-		__fpu_mov(fe, type, rd, rs2, 0, (1 << 31));
+		__fpu_mov(fe, type, rd, rs2, 0, (1U << 31));
 		return (0);
 	case FOP(INS2_FPop1, INSFP1_FABS):
-		__fpu_mov(fe, type, rd, rs2, (1 << 31), 0);
+		__fpu_mov(fe, type, rd, rs2, (1U << 31), 0);
 		return (0);
 	case FOP(INS2_FPop1, INSFP1_FSQRT):
 		__fpu_explode(fe, &fe->fe_f1, type, rs2);

Modified: projects/sendfile/lib/libc/sparc64/fpu/fpu_sqrt.c
==============================================================================
--- projects/sendfile/lib/libc/sparc64/fpu/fpu_sqrt.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/lib/libc/sparc64/fpu/fpu_sqrt.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -257,7 +257,7 @@ __fpu_sqrt(fe)
 	 * double x correctly while doing the `known q=1.0'.
 	 *
 	 * We do this one mantissa-word at a time, as noted above, to
-	 * save work.  To avoid `(1 << 31) << 1', we also do the top bit
+	 * save work.  To avoid `(1U << 31) << 1', we also do the top bit
 	 * outside of each per-word loop.
 	 *
 	 * The calculation `t = y + bit' breaks down into `t0 = y0, ...,

Modified: projects/sendfile/lib/libc/sys/chmod.2
==============================================================================
--- projects/sendfile/lib/libc/sys/chmod.2	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/lib/libc/sys/chmod.2	Sun Dec  1 14:03:03 2013	(r258795)
@@ -28,7 +28,7 @@
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2008
+.Dd December 1, 2013
 .Dt CHMOD 2
 .Os
 .Sh NAME
@@ -139,21 +139,24 @@ defined in
 
 #define S_ISUID 0004000    /* set user id on execution */
 #define S_ISGID 0002000    /* set group id on execution */
-#ifndef __BSD_VISIBLE
-#define S_ISTXT 0001000    /* sticky bit */
-#endif
+#define S_ISVTX 0001000    /* sticky bit */
 .Ed
 .Pp
+The non-standard
+.Dv S_ISTXT
+is a synonym for
+.Dv S_ISVTX .
+.Pp
 The
 .Fx
 VM system totally ignores the sticky bit
-.Pq Dv ISTXT
+.Pq Dv S_ISVTX
 for executables.
 On UFS-based file systems (FFS, LFS) the sticky
 bit may only be set upon directories.
 .Pp
 If mode
-.Dv ISTXT
+.Dv S_ISVTX
 (the `sticky bit') is set on a directory,
 an unprivileged user may not delete or rename
 files of other users in that directory.
@@ -296,12 +299,15 @@ The
 system call is expected to conform to
 .St -p1003.1-90 ,
 except for the return of
-.Er EFTYPE
-and the use of
-.Dv S_ISTXT .
+.Er EFTYPE .
+The
+.Dv S_ISVTX
+bit on directories is expected to conform to
+.St -susv3 .
 The
 .Fn fchmodat
-system call follows The Open Group Extended API Set 2 specification.
+system call is expected to conform to
+.St -p1003.1-2008 .
 .Sh HISTORY
 The
 .Fn chmod

Modified: projects/sendfile/lib/libc/sys/pdfork.2
==============================================================================
--- projects/sendfile/lib/libc/sys/pdfork.2	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/lib/libc/sys/pdfork.2	Sun Dec  1 14:03:03 2013	(r258795)
@@ -125,12 +125,6 @@ is set; if the process is still alive an
 the last reference to the process descriptor, the process will be terminated
 with the signal
 .Dv SIGKILL .
-.Pp
-.Nm
-and associated functions depend on
-.Cd "options PROCDESC"
-described in
-.Xr procdesc 4 .
 .Sh RETURN VALUES
 .Fn pdfork
 returns a PID, 0 or -1, as

Modified: projects/sendfile/lib/libc/sys/wait.2
==============================================================================
--- projects/sendfile/lib/libc/sys/wait.2	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/lib/libc/sys/wait.2	Sun Dec  1 14:03:03 2013	(r258795)
@@ -48,7 +48,7 @@
 .Fn wait "int *status"
 .Ft pid_t
 .Fn waitpid "pid_t wpid" "int *status" "int options"
-.In sys/signal.h
+.In signal.h
 .Ft int
 .Fn waitid "idtype_t idtype" "id_t id" "siginfo_t *info" "int options"
 .In sys/time.h

Modified: projects/sendfile/lib/libc/xdr/xdr_rec.c
==============================================================================
--- projects/sendfile/lib/libc/xdr/xdr_rec.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/lib/libc/xdr/xdr_rec.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -106,7 +106,7 @@ static const struct  xdr_ops xdrrec_ops 
  * meet the needs of xdr and rpc based on tcp.
  */
 
-#define LAST_FRAG ((u_int32_t)(1 << 31))
+#define LAST_FRAG ((u_int32_t)(1U << 31))
 
 typedef struct rec_strm {
 	char *tcp_handle;

Modified: projects/sendfile/release/Makefile
==============================================================================
--- projects/sendfile/release/Makefile	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/release/Makefile	Sun Dec  1 14:03:03 2013	(r258795)
@@ -16,6 +16,7 @@
 #            (by default, the directory above this one) 
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
+#  NOPKG:    if set, do not distribute third-party packages
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
@@ -212,7 +213,7 @@ packagesystem: base.txz kernel.txz ${EXT
 	touch ${.TARGET}
 
 pkg-stage:
-.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
+.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
 	sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
 		${REVISION}
 .endif

Modified: projects/sendfile/release/release.sh
==============================================================================
--- projects/sendfile/release/release.sh	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/release/release.sh	Sun Dec  1 14:03:03 2013	(r258795)
@@ -176,9 +176,9 @@ build_doc_ports() {
 	_OSVERSION=$(sysctl -n kern.osreldate)
 	if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
 		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
-		PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'"
+		PBUILD_FLAGS="${PBUILD_FLAGS}"
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
-			${PBUILD_FLAGS} install clean distclean
+			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
 	fi
 }
 

Modified: projects/sendfile/sbin/Makefile
==============================================================================
--- projects/sendfile/sbin/Makefile	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sbin/Makefile	Sun Dec  1 14:03:03 2013	(r258795)
@@ -72,7 +72,7 @@ SUBDIR=adjkerntz \
 	swapon \
 	sysctl \
 	tunefs \
-	umount \
+	umount
 
 .if ${MK_ATM} != "no"
 SUBDIR+=	atm

Modified: projects/sendfile/share/man/man4/capsicum.4
==============================================================================
--- projects/sendfile/share/man/man4/capsicum.4	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/share/man/man4/capsicum.4	Sun Dec  1 14:03:03 2013	(r258795)
@@ -35,7 +35,6 @@
 .Sh SYNOPSIS
 .Cd "options CAPABILITY_MODE"
 .Cd "options CAPABILITIES"
-.Cd "options PROCDESC"
 .Sh DESCRIPTION
 .Nm
 is a lightweight OS capability and sandbox framework implementing a hybrid

Modified: projects/sendfile/share/man/man4/procdesc.4
==============================================================================
--- projects/sendfile/share/man/man4/procdesc.4	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/share/man/man4/procdesc.4	Sun Dec  1 14:03:03 2013	(r258795)
@@ -35,8 +35,6 @@
 .Sh NAME
 .Nm procdesc
 .Nd process descriptor facility
-.Sh SYNOPSIS
-.Cd "options PROCDESC"
 .Sh DESCRIPTION
 .Nm
 is a file-descriptor-oriented interface to process signalling and control,

Modified: projects/sendfile/share/mk/bsd.libnames.mk
==============================================================================
--- projects/sendfile/share/mk/bsd.libnames.mk	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/share/mk/bsd.libnames.mk	Sun Dec  1 14:03:03 2013	(r258795)
@@ -127,6 +127,7 @@ MINUSLPAM+=	-lypclnt
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
+LIBPJDLOG?=	${DESTDIR}${LIBDIR}/libpjdlog.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPROCSTAT?=	${DESTDIR}${LIBDIR}/libprocstat.a

Modified: projects/sendfile/sys/amd64/conf/GENERIC
==============================================================================
--- projects/sendfile/sys/amd64/conf/GENERIC	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/amd64/conf/GENERIC	Sun Dec  1 14:03:03 2013	(r258795)
@@ -66,7 +66,6 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	CAPABILITY_MODE		# Capsicum capability mode
 options 	CAPABILITIES		# Capsicum capabilities
-options 	PROCDESC		# Support for process descriptors
 options 	MAC			# TrustedBSD MAC Framework
 options 	KDTRACE_FRAME		# Ensure frames are compiled in
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks

Modified: projects/sendfile/sys/amd64/pci/pci_cfgreg.c
==============================================================================
--- projects/sendfile/sys/amd64/pci/pci_cfgreg.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/amd64/pci/pci_cfgreg.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -184,7 +184,7 @@ pci_cfgenable(unsigned bus, unsigned slo
 	if (bus <= PCI_BUSMAX && slot <= PCI_SLOTMAX && func <= PCI_FUNCMAX &&
 	    (unsigned)reg <= PCI_REGMAX && bytes != 3 &&
 	    (unsigned)bytes <= 4 && (reg & (bytes - 1)) == 0) {
-		outl(CONF1_ADDR_PORT, (1 << 31) | (bus << 16) | (slot << 11) 
+		outl(CONF1_ADDR_PORT, (1U << 31) | (bus << 16) | (slot << 11) 
 		    | (func << 8) | (reg & ~0x03));
 		dataport = CONF1_DATA_PORT + (reg & 0x03);
 	}

Modified: projects/sendfile/sys/amd64/vmm/intel/vmcs.h
==============================================================================
--- projects/sendfile/sys/amd64/vmm/intel/vmcs.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/amd64/vmm/intel/vmcs.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -318,7 +318,7 @@ uint64_t vmcs_read(uint32_t encoding);
 /*
  * VMCS IDT-Vectoring information fields
  */
-#define	VMCS_IDT_VEC_VALID		(1 << 31)
+#define	VMCS_IDT_VEC_VALID		(1U << 31)
 #define	VMCS_IDT_VEC_ERRCODE_VALID	(1 << 11)
 
 /*

Modified: projects/sendfile/sys/amd64/vmm/intel/vmx_controls.h
==============================================================================
--- projects/sendfile/sys/amd64/vmm/intel/vmx_controls.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/amd64/vmm/intel/vmx_controls.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -56,7 +56,7 @@
 #define	PROCBASED_MSR_BITMAPS		(1 << 28)
 #define	PROCBASED_MONITOR_EXITING	(1 << 29)
 #define	PROCBASED_PAUSE_EXITING		(1 << 30)
-#define	PROCBASED_SECONDARY_CONTROLS	(1 << 31)
+#define	PROCBASED_SECONDARY_CONTROLS	(1U << 31)
 
 /* Secondary Processor-Based VM-Execution Controls */
 #define	PROCBASED2_VIRTUALIZE_APIC	(1 << 0)

Modified: projects/sendfile/sys/amd64/vmm/intel/vtd.c
==============================================================================
--- projects/sendfile/sys/amd64/vmm/intel/vtd.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/amd64/vmm/intel/vtd.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -73,11 +73,11 @@ struct vtdmap {
 
 #define	VTD_GCR_WBF		(1 << 27)
 #define	VTD_GCR_SRTP		(1 << 30)
-#define	VTD_GCR_TE		(1 << 31)
+#define	VTD_GCR_TE		(1U << 31)
 
 #define	VTD_GSR_WBFS		(1 << 27)
 #define	VTD_GSR_RTPS		(1 << 30)
-#define	VTD_GSR_TES		(1 << 31)
+#define	VTD_GSR_TES		(1U << 31)
 
 #define	VTD_CCR_ICC		(1UL << 63)	/* invalidate context cache */
 #define	VTD_CCR_CIRG_GLOBAL	(1UL << 61)	/* global invalidation */

Modified: projects/sendfile/sys/arm/arm/db_trace.c
==============================================================================
--- projects/sendfile/sys/arm/arm/db_trace.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/arm/db_trace.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -376,7 +376,7 @@ db_stack_trace_cmd(struct unwind_state *
 		index = db_find_index(state->start_pc);
 
 		if (index->insn != EXIDX_CANTUNWIND) {
-			if (index->insn & (1 << 31)) {
+			if (index->insn & (1U << 31)) {
 				/* The data is within the instruction */
 				state->insn = &index->insn;
 			} else {

Modified: projects/sendfile/sys/arm/arm/pl190.c
==============================================================================
--- projects/sendfile/sys/arm/arm/pl190.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/arm/pl190.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -113,7 +113,7 @@ pl190_intc_attach(device_t dev)
 	/* Disable all interrupts */
 	intc_vic_write_4(VICINTENCLEAR, 0xffffffff);
 	/* Enable INT31, SIC IRQ */
-	intc_vic_write_4(VICINTENABLE, (1 << 31));
+	intc_vic_write_4(VICINTENABLE, (1U << 31));
 
 	id = 0;
 	for (i = 3; i >= 0; i--) {

Modified: projects/sendfile/sys/arm/at91/if_macbvar.h
==============================================================================
--- projects/sendfile/sys/arm/at91/if_macbvar.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/at91/if_macbvar.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -18,7 +18,7 @@
 struct eth_tx_desc {
 	uint32_t		addr;
 	uint32_t		flags;
-#define TD_OWN		(1 << 31)
+#define TD_OWN		(1U << 31)
 #define TD_LAST		(1 << 15)
 #define	TD_WRAP_MASK		(1 << 30)
 };
@@ -30,7 +30,7 @@ struct eth_rx_desc {
 #define	RD_OWN			0x00000001
 
 	uint32_t		flags;
-#define RD_BROADCAST		(1 << 31)
+#define RD_BROADCAST		(1U << 31)
 #define RD_MULTICAST		(1 << 30)
 #define RD_UNICAST		(1 << 29)
 #define RD_EXTERNAL		(1 << 28)

Modified: projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_dma.c
==============================================================================
--- projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_dma.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_dma.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 #define		CS_WAITWRT		(1 << 28)
 #define		CS_DISDBG		(1 << 29)
 #define		CS_ABORT		(1 << 30)
-#define		CS_RESET		(1 << 31)
+#define		CS_RESET		(1U << 31)
 #define	BCM_DMA_CBADDR(n)	(0x100*(n) + 0x04)
 #define	BCM_DMA_INFO(n)		(0x100*(n) + 0x08)
 #define		INFO_INT_EN		(1 << 0)

Modified: projects/sendfile/sys/arm/econa/if_ece.c
==============================================================================
--- projects/sendfile/sys/arm/econa/if_ece.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/econa/if_ece.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -1243,7 +1243,7 @@ configure_cpu_port(struct ece_softc *sc)
 	/* SA learning Disable */
 	cpu_port_config |= (SA_LEARNING_DISABLE);
 	/* set data offset + 2 */
-	cpu_port_config &= ~(1 << 31);
+	cpu_port_config &= ~(1U << 31);
 
 	write_4(sc, CPU_PORT_CONFIG, cpu_port_config);
 

Modified: projects/sendfile/sys/arm/freescale/imx/imx6_anatopreg.h
==============================================================================
--- projects/sendfile/sys/arm/freescale/imx/imx6_anatopreg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/freescale/imx/imx6_anatopreg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -37,7 +37,7 @@
 #define	IMX6_ANALOG_CCM_PLL_USB1_SET			0x014
 #define	IMX6_ANALOG_CCM_PLL_USB1_CLR			0x018
 #define	IMX6_ANALOG_CCM_PLL_USB1_TOG			0x01C
-#define	   IMX6_ANALOG_CCM_PLL_USB_LOCK			  (1 << 31)
+#define	   IMX6_ANALOG_CCM_PLL_USB_LOCK			  (1U << 31)
 #define	   IMX6_ANALOG_CCM_PLL_USB_BYPASS		  (1 << 16)
 #define	   IMX6_ANALOG_CCM_PLL_USB_ENABLE		  (1 << 13)
 #define	   IMX6_ANALOG_CCM_PLL_USB_POWER		  (1 << 12)

Modified: projects/sendfile/sys/arm/freescale/imx/imx6_usbphy.c
==============================================================================
--- projects/sendfile/sys/arm/freescale/imx/imx6_usbphy.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/freescale/imx/imx6_usbphy.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #define	CTRL_SET_REG			0x0034
 #define	CTRL_CLR_REG			0x0038
 #define	CTRL_TOGGLE_REG			0x003c
-#define	  CTRL_SFTRST			  (1 << 31)
+#define	  CTRL_SFTRST			  (1U << 31)
 #define	  CTRL_CLKGATE			  (1 << 30)
 #define	  CTRL_ENUTMILEVEL3		  (1 << 15)
 #define	  CTRL_ENUTMILEVEL2		  (1 << 14)

Modified: projects/sendfile/sys/arm/freescale/imx/imx_gptreg.h
==============================================================================
--- projects/sendfile/sys/arm/freescale/imx/imx_gptreg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/freescale/imx/imx_gptreg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -32,7 +32,7 @@
 /* Registers definition for Freescale i.MX515 Generic Periodic Timer */
 
 #define	IMX_GPT_CR	0x0000 /* Control Register          R/W */
-#define		GPT_CR_FO3		(1 << 31)
+#define		GPT_CR_FO3		(1U << 31)
 #define		GPT_CR_FO2		(1 << 30)
 #define		GPT_CR_FO1		(1 << 29)
 #define		GPT_CR_OM3_SHIFT	26

Modified: projects/sendfile/sys/arm/freescale/vybrid/vf_anadig.c
==============================================================================
--- projects/sendfile/sys/arm/freescale/vybrid/vf_anadig.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/freescale/vybrid/vf_anadig.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -90,7 +90,7 @@ __FBSDID("$FreeBSD$");
 #define	USB_LOOPBACK(n)			(0x1E0 + 0x60 * n)
 #define	USB_MISC(n)			(0x1F0 + 0x60 * n)
 
-#define	ANADIG_PLL_LOCKED	(1 << 31)
+#define	ANADIG_PLL_LOCKED	(1U << 31)
 #define	ENABLE_LINREG		(1 << 0)
 #define	EN_CLK_TO_UTMI		(1 << 30)
 

Modified: projects/sendfile/sys/arm/freescale/vybrid/vf_ccm.c
==============================================================================
--- projects/sendfile/sys/arm/freescale/vybrid/vf_ccm.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/freescale/vybrid/vf_ccm.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
 #define	CCM_CPPDSR	0x88	/* PLL PFD Disable Status Register */
 #define	CCM_CCOWR	0x8C	/* CORE Wakeup Register */
 
-#define	PLL3_PFD4_EN	(1 << 31)
+#define	PLL3_PFD4_EN	(1U << 31)
 #define	PLL3_PFD3_EN	(1 << 30)
 #define	PLL3_PFD2_EN	(1 << 29)
 #define	PLL3_PFD1_EN	(1 << 28)

Modified: projects/sendfile/sys/arm/freescale/vybrid/vf_ehci.c
==============================================================================
--- projects/sendfile/sys/arm/freescale/vybrid/vf_ehci.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/freescale/vybrid/vf_ehci.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -105,7 +105,7 @@ __FBSDID("$FreeBSD$");
 #define	USBPHY_IP_CLR		0x98	/* PHY IP Block Register */
 #define	USBPHY_IP_TOG		0x9C	/* PHY IP Block Register */
 
-#define	USBPHY_CTRL_SFTRST	(1 << 31)
+#define	USBPHY_CTRL_SFTRST	(1U << 31)
 #define	USBPHY_CTRL_CLKGATE	(1 << 30)
 #define	USBPHY_DEBUG_CLKGATE	(1 << 30)
 

Modified: projects/sendfile/sys/arm/include/armreg.h
==============================================================================
--- projects/sendfile/sys/arm/include/armreg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/include/armreg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -360,7 +360,7 @@
 
 #define	CPU_CT_ARMV7		0x4
 /* ARM v7 Cache type definitions */
-#define	CPUV7_CT_CTYPE_WT	(1 << 31)
+#define	CPUV7_CT_CTYPE_WT	(1U << 31)
 #define	CPUV7_CT_CTYPE_WB	(1 << 30)
 #define	CPUV7_CT_CTYPE_RA	(1 << 29)
 #define	CPUV7_CT_CTYPE_WA	(1 << 28)

Modified: projects/sendfile/sys/arm/lpc/if_lpereg.h
==============================================================================
--- projects/sendfile/sys/arm/lpc/if_lpereg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/lpc/if_lpereg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -169,7 +169,7 @@ struct lpe_hwstatus {
 
 /* These are valid for both Rx and Tx descriptors */
 #define	LPE_HWDESC_SIZE_MASK	(1 << 10)
-#define	LPE_HWDESC_INTERRUPT	(1 << 31)
+#define	LPE_HWDESC_INTERRUPT	(1U << 31)
 
 /* These are valid for Tx descriptors */
 #define	LPE_HWDESC_LAST		(1 << 30)
@@ -186,7 +186,7 @@ struct lpe_hwstatus {
 #define	LPE_HWDESC_LATECOLL	(1 << 28)
 #define	LPE_HWDESC_UNDERRUN	(1 << 29)
 #define	LPE_HWDESC_TXNODESCR	(1 << 30)
-#define	LPE_HWDESC_ERROR	(1 << 31)
+#define	LPE_HWDESC_ERROR	(1U << 31)
 
 /* These are valid for Rx status descriptors */
 #define	LPE_HWDESC_CONTROL	(1 << 18)
@@ -202,7 +202,7 @@ struct lpe_hwstatus {
 #define	LPE_HWDESC_OVERRUN	(1 << 28)
 #define	LPE_HWDESC_RXNODESCR	(1 << 29)
 #define	LPE_HWDESC_LASTFLAG	(1 << 30)
-#define	LPE_HWDESC_ERROR	(1 << 31)
+#define	LPE_HWDESC_ERROR	(1U << 31)
 
 
 #endif	/* _ARM_LPC_IF_LPEREG_H */

Modified: projects/sendfile/sys/arm/lpc/lpcreg.h
==============================================================================
--- projects/sendfile/sys/arm/lpc/lpcreg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/lpc/lpcreg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -604,7 +604,7 @@
 #define	LPC_DMAC_CH_LLI			0x08
 #define	LPC_DMAC_CH_LLI_AHB1		(1 << 0)
 #define	LPC_DMAC_CH_CONTROL		0x0c
-#define	LPC_DMAC_CH_CONTROL_I		(1 << 31)
+#define	LPC_DMAC_CH_CONTROL_I		(1U << 31)
 #define	LPC_DMAC_CH_CONTROL_DI		(1 << 27)
 #define	LPC_DMAC_CH_CONTROL_SI		(1 << 26)
 #define	LPC_DMAC_CH_CONTROL_D		(1 << 25)

Modified: projects/sendfile/sys/arm/mv/mv_pci.c
==============================================================================
--- projects/sendfile/sys/arm/mv/mv_pci.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/mv/mv_pci.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$");
 #define debugf(fmt, args...)
 #endif
 
-#define PCI_CFG_ENA		(1 << 31)
+#define PCI_CFG_ENA		(1U << 31)
 #define PCI_CFG_BUS(bus)	(((bus) & 0xff) << 16)
 #define PCI_CFG_DEV(dev)	(((dev) & 0x1f) << 11)
 #define PCI_CFG_FUN(fun)	(((fun) & 0x7) << 8)

Modified: projects/sendfile/sys/arm/samsung/exynos/ehci_exynos5.c
==============================================================================
--- projects/sendfile/sys/arm/samsung/exynos/ehci_exynos5.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/samsung/exynos/ehci_exynos5.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
 #define	HOST_CTRL_SUSPEND	(1 << 4)
 #define	HOST_CTRL_RESET_LINK	(1 << 1)
 #define	HOST_CTRL_RESET_PHY	(1 << 0)
-#define	HOST_CTRL_RESET_PHY_ALL	(1 << 31)
+#define	HOST_CTRL_RESET_PHY_ALL	(1U << 31)
 
 /* Forward declarations */
 static int	exynos_ehci_attach(device_t dev);

Modified: projects/sendfile/sys/arm/xscale/i8134x/i81342reg.h
==============================================================================
--- projects/sendfile/sys/arm/xscale/i8134x/i81342reg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/xscale/i8134x/i81342reg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -83,7 +83,7 @@
 #define IOP34X_ADMA_PQTE	(1 << 18) /* P+Q Transfer Enable */
 #define IOP34X_ADMA_PTD		(1 << 19) /* P Transfer Disable */
 #define IOP34X_ADMA_ROE		(1 << 30) /* Relaxed Ordering Enable */
-#define IOP34X_ADMA_NSE		(1 << 31) /* No Snoop Enable */
+#define IOP34X_ADMA_NSE		(1U << 31) /* No Snoop Enable */
 
 #define IOP34X_PBBAR0		0x81588 /* PBI Base Address Register 0 */
 #define IOP34X_PBBAR0_ADDRMASK	0xfffff000
@@ -113,7 +113,7 @@
 #define SMC_SDBR		0x8180c /* Base Register */
 #define SMC_SDBR_BASEADDR	(1 << 27)
 #define SMC_SDBR_BASEADDR_MASK	((1 << 27) | (1 << 28) | (1 << 29) | (1 << 30) \
-    				| (1 << 31))
+    				| (1U << 31))
 #define SMC_SDUBR		0x81810 /* Upper Base Register */
 #define SMC_SBSR		0x81814 /* SDRAM Bank Size Register */
 #define SMC_SBSR_BANK_NB	(1 << 2) /* Number of DDR Banks
@@ -128,7 +128,7 @@
 					   0x01000 1GB
 					   */
 #define SMC_SBSR_BANK_SZ_MASK	((1 << 27) | (1 << 28) | (1 << 29) | (1 << 30) \
-    				| (1 << 31))
+    				| (1U << 31))
 
 
 /* Two possible addresses for ATUe depending on configuration. */
@@ -190,7 +190,7 @@
 #define ATU_CR_OUT_EN	(1 << 1)
 #define ATU_PCSR	0x0074 /* PCI Configuration and Status Register */
 #define PCIE_BUSNO(x)	((x & 0xff000000) >> 24)
-#define ATUX_CORE_RST	((1 << 30) | (1 << 31)) /* Core Processor Reset */
+#define ATUX_CORE_RST	((1 << 30) | (1U << 31)) /* Core Processor Reset */
 #define ATUX_P_RSTOUT	(1 << 21) /* Central Resource PCI Bus Reset */
 #define ATUE_CORE_RST	((1 << 9) | (1 << 8)) /* Core Processor Reset */
 #define ATU_ISR		0x0078 /* ATU Interrupt Status Register */
@@ -250,7 +250,7 @@
 #define ATU_OIOWTVR	0x0304 /* Outbound I/O Window Translate Value Reg */
 #define ATU_OUMBAR0	0x0308 /* Outbound Upper Memory Window base addr reg 0*/
 #define ATU_OUMBAR_FUNC	(28)
-#define ATU_OUMBAR_EN	(1 << 31)
+#define ATU_OUMBAR_EN	(1U << 31)
 #define ATU_OUMWTVR0	0x030c /* Outbound Upper 32bit Memory Window Translate Value Register 0 */
 #define ATU_OUMBAR1	0x0310 /* Outbound Upper Memory Window base addr reg1*/
 #define ATU_OUMWTVR1	0x0314 /* Outbound Upper 32bit Memory Window Translate Value Register 1 */

Modified: projects/sendfile/sys/arm/xscale/ixp425/ixp425reg.h
==============================================================================
--- projects/sendfile/sys/arm/xscale/ixp425/ixp425reg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/arm/xscale/ixp425/ixp425reg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -400,7 +400,7 @@
 #define EXP_CNFG0_PCI_HOST         (1 << 1)
 #define EXP_CNFG0_PCI_ARB          (1 << 2)
 #define EXP_CNFG0_PCI_66MHZ        (1 << 4)
-#define EXP_CNFG0_MEM_MAP          (1 << 31)
+#define EXP_CNFG0_MEM_MAP          (1U << 31)
 
 /* EXP_CNFG1 bits */
 #define EXP_CNFG1_SW_INT0          (1 << 0)

Modified: projects/sendfile/sys/boot/arm/at91/libat91/mci_device.h
==============================================================================
--- projects/sendfile/sys/boot/arm/at91/libat91/mci_device.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/boot/arm/at91/libat91/mci_device.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -306,7 +306,7 @@ typedef struct _AT91S_MciDevice
 #define AT91C_VDD_33_34					(1 << 21)
 #define AT91C_VDD_34_35					(1 << 22)
 #define AT91C_VDD_35_36					(1 << 23)
-#define AT91C_CARD_POWER_UP_BUSY		(1 << 31)
+#define AT91C_CARD_POWER_UP_BUSY		(1U << 31)
 
 #define AT91C_MMC_HOST_VOLTAGE_RANGE	(AT91C_VDD_27_28 | AT91C_VDD_28_29  | \
     AT91C_VDD_29_30 | AT91C_VDD_30_31 | AT91C_VDD_31_32 | AT91C_VDD_32_33)

Modified: projects/sendfile/sys/boot/i386/libfirewire/fwohci.h
==============================================================================
--- projects/sendfile/sys/boot/i386/libfirewire/fwohci.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/boot/i386/libfirewire/fwohci.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -76,7 +76,7 @@ void fwohci_poll(struct fwohci_softc *);
 #define	OHCI_CROMHDR		0x18
 #define OHCI_BUS_ID		0x1c
 #define	OHCI_BUS_OPT		0x20
-#define	OHCI_BUSIRMC		(1 << 31)
+#define	OHCI_BUSIRMC		(1U << 31)
 #define	OHCI_BUSCMC		(1 << 30)
 #define	OHCI_BUSISC		(1 << 29)
 #define	OHCI_BUSBMC		(1 << 28)
@@ -102,7 +102,7 @@ void fwohci_poll(struct fwohci_softc *);
 
 #define	OHCI_SID_BUF		0x64
 #define	OHCI_SID_CNT		0x68
-#define OHCI_SID_ERR		(1 << 31)
+#define OHCI_SID_ERR		(1U << 31)
 #define OHCI_SID_CNT_MASK	0xffc
 
 #define	OHCI_IT_STAT		0x90

Modified: projects/sendfile/sys/boot/i386/libfirewire/fwohcireg.h
==============================================================================
--- projects/sendfile/sys/boot/i386/libfirewire/fwohcireg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/boot/i386/libfirewire/fwohcireg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -239,7 +239,7 @@ struct ohci_registers {
 	fwohcireg_t	dummy1[3];	/* dummy 0x44-0x4c */
 	fwohcireg_t	hcc_cntl_set;	/* HCC control set 0x50 */
 	fwohcireg_t	hcc_cntl_clr;	/* HCC control clr 0x54 */
-#define	OHCI_HCC_BIBIV	(1 << 31)	/* BIBimage Valid */
+#define	OHCI_HCC_BIBIV	(1U << 31)	/* BIBimage Valid */
 #define	OHCI_HCC_BIGEND	(1 << 30)	/* noByteSwapData */
 #define	OHCI_HCC_PRPHY	(1 << 23)	/* programPhyEnable */
 #define	OHCI_HCC_PHYEN	(1 << 22)	/* aPhyEnhanceEnable */
@@ -278,7 +278,7 @@ struct ohci_registers {
 	fwohcireg_t	link_cntl_clr;	/* Chip control clear 0xe4*/
 #define FWOHCI_NODEID	0xe8
 	fwohcireg_t	node;		/* Node ID 0xe8 */
-#define	OHCI_NODE_VALID	(1 << 31)
+#define	OHCI_NODE_VALID	(1U << 31)
 #define	OHCI_NODE_ROOT	(1 << 30)
 
 #define	OHCI_ASYSRCBUS	1

Modified: projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -83,6 +83,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/msg.h>
 #include <sys/sem.h>
 #include <sys/shm.h>
+#include <sys/condvar.h>
+#include <sys/sf_buf.h>
+#include <sys/sf_sync.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -1653,12 +1656,14 @@ freebsd32_do_sendfile(struct thread *td,
 	off_t offset;
 	int error;
 	off_t sbytes;
+	struct sendfile_sync *sfs;
 
 	offset = PAIR32TO64(off_t, uap->offset);
 	if (offset < 0)
 		return (EINVAL);
 
 	hdr_uio = trl_uio = NULL;
+	sfs = NULL;
 
 	if (uap->hdtr != NULL) {
 		error = copyin(uap->hdtr, &hdtr32, sizeof(hdtr32));
@@ -1692,8 +1697,21 @@ freebsd32_do_sendfile(struct thread *td,
 		goto out;
 	}
 
+	/*
+	 * If we need to wait for completion, initialise the sfsync
+	 * state here.
+	 */
+	if (uap->flags & SF_SYNC)
+		sfs = sf_sync_alloc(uap->flags & SF_SYNC);
+
 	error = fo_sendfile(fp, uap->s, hdr_uio, trl_uio, offset,
-	    uap->nbytes, &sbytes, uap->flags, compat ? SFK_COMPAT : 0, td);
+	    uap->nbytes, &sbytes, uap->flags, compat ? SFK_COMPAT : 0,
+	    sfs, td);
+	if (sfs != NULL) {
+		sf_sync_syscall_wait(sfs);
+		sf_sync_free(sfs);
+	}
+
 	fdrop(fp, td);
 	if (uap->sbytes != NULL)
 		copyout(&sbytes, uap->sbytes, sizeof(off_t));

Modified: projects/sendfile/sys/conf/NOTES
==============================================================================
--- projects/sendfile/sys/conf/NOTES	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/conf/NOTES	Sun Dec  1 14:03:03 2013	(r258795)
@@ -1167,9 +1167,6 @@ options 	MAC_TEST
 options 	CAPABILITIES	# fine-grained rights on file descriptors
 options 	CAPABILITY_MODE	# sandboxes with no global namespace access
 
-# Support for process descriptors
-options		PROCDESC
-
 

 #####################################################################
 # CLOCK OPTIONS

Modified: projects/sendfile/sys/conf/options
==============================================================================
--- projects/sendfile/sys/conf/options	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/conf/options	Sun Dec  1 14:03:03 2013	(r258795)
@@ -165,7 +165,6 @@ PPC_DEBUG	opt_ppc.h
 PPC_PROBE_CHIPSET	opt_ppc.h
 PPS_SYNC	opt_ntp.h
 PREEMPTION	opt_sched.h
-PROCDESC	opt_procdesc.h
 QUOTA
 SCHED_4BSD	opt_sched.h
 SCHED_STATS	opt_sched.h

Modified: projects/sendfile/sys/dev/aac/aacvar.h
==============================================================================
--- projects/sendfile/sys/dev/aac/aacvar.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/dev/aac/aacvar.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -412,7 +412,7 @@ struct aac_softc
 #define AAC_FLAGS_RAW_IO	(1 << 12)	/* Raw I/O interface */
 #define AAC_FLAGS_ARRAY_64BIT	(1 << 13)	/* 64-bit array size */
 #define	AAC_FLAGS_LBA_64BIT	(1 << 14)	/* 64-bit LBA support */
-#define	AAC_FLAGS_NOMSI		(1 << 31)	/* Broken MSI */
+#define	AAC_FLAGS_NOMSI		(1U << 31)	/* Broken MSI */
 
 	u_int32_t		supported_options;
 	u_int32_t		scsi_method_id;

Modified: projects/sendfile/sys/dev/acpica/acpi_video.c
==============================================================================
--- projects/sendfile/sys/dev/acpica/acpi_video.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/dev/acpica/acpi_video.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -132,7 +132,7 @@ static void	vo_set_device_state(ACPI_HAN
 #define	DOD_HEAD_ID_BITS	3
 #define	DOD_HEAD_ID_MASK \
 		(((1 << DOD_HEAD_ID_BITS) - 1) << DOD_HEAD_ID_SHIFT)
-#define	DOD_DEVID_SCHEME_STD	(1 << 31)
+#define	DOD_DEVID_SCHEME_STD	(1U << 31)
 
 /* _BCL related constants */
 #define	BCL_FULLPOWER		0
@@ -149,7 +149,7 @@ static void	vo_set_device_state(ACPI_HAN
 #define	DSS_INACTIVE		0
 #define	DSS_ACTIVE		(1 << 0)
 #define	DSS_SETNEXT		(1 << 30)
-#define	DSS_COMMIT		(1 << 31)
+#define	DSS_COMMIT		(1U << 31)
 
 static device_method_t acpi_video_methods[] = {
 	DEVMETHOD(device_identify, acpi_video_identify),

Modified: projects/sendfile/sys/dev/agp/agp_i810.c
==============================================================================
--- projects/sendfile/sys/dev/agp/agp_i810.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/dev/agp/agp_i810.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -2226,10 +2226,10 @@ agp_i830_chipset_flush(device_t dev)
 	sc = device_get_softc(dev);
 	pmap_invalidate_cache();
 	hic = bus_read_4(sc->sc_res[0], AGP_I830_HIC);
-	bus_write_4(sc->sc_res[0], AGP_I830_HIC, hic | (1 << 31));
+	bus_write_4(sc->sc_res[0], AGP_I830_HIC, hic | (1U << 31));
 	for (i = 0; i < 20000 /* 1 sec */; i++) {
 		hic = bus_read_4(sc->sc_res[0], AGP_I830_HIC);
-		if ((hic & (1 << 31)) == 0)
+		if ((hic & (1U << 31)) == 0)
 			break;
 		DELAY(50);
 	}

Modified: projects/sendfile/sys/dev/ahci/ahci.h
==============================================================================
--- projects/sendfile/sys/dev/ahci/ahci.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/dev/ahci/ahci.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -321,7 +321,7 @@ struct ahci_dma_prd {
     u_int32_t                   dbc;            /* 0 based */
 #define AHCI_PRD_MASK		0x003fffff      /* max 4MB */
 #define AHCI_PRD_MAX		(AHCI_PRD_MASK + 1)
-#define AHCI_PRD_IPC		(1 << 31)
+#define AHCI_PRD_IPC		(1U << 31)
 } __packed;
 
 struct ahci_cmd_tab {

Modified: projects/sendfile/sys/dev/bktr/bktr_core.c
==============================================================================
--- projects/sendfile/sys/dev/bktr/bktr_core.c	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/dev/bktr/bktr_core.c	Sun Dec  1 14:03:03 2013	(r258795)
@@ -2599,7 +2599,7 @@ dump_bt848( bktr_ptr_t bktr )
 #define BKTR_TEST_RISC_STATUS_BIT0 (1 << 28)
 #define BKTR_TEST_RISC_STATUS_BIT1 (1 << 29)
 #define BKTR_TEST_RISC_STATUS_BIT2 (1 << 30)
-#define BKTR_TEST_RISC_STATUS_BIT3 (1 << 31)
+#define BKTR_TEST_RISC_STATUS_BIT3 (1U << 31)
 
 static bool_t notclipped (bktr_reg_t * bktr, int x, int width) {
     int i;

Modified: projects/sendfile/sys/dev/cesa/cesa.h
==============================================================================
--- projects/sendfile/sys/dev/cesa/cesa.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/dev/cesa/cesa.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -297,8 +297,8 @@ struct cesa_chain_info {
 #define CESA_CSH_AES_KLEN_MASK		(3 << 24)
 
 #define CESA_CSHD_FRAG_FIRST		(1 << 30)
-#define CESA_CSHD_FRAG_LAST		(2 << 30)
-#define CESA_CSHD_FRAG_MIDDLE		(3 << 30)
+#define CESA_CSHD_FRAG_LAST		(2U << 30)
+#define CESA_CSHD_FRAG_MIDDLE		(3U << 30)
 
 /* CESA registers definitions */
 #define CESA_ICR			0xDE20

Modified: projects/sendfile/sys/dev/drm/i915_reg.h
==============================================================================
--- projects/sendfile/sys/dev/drm/i915_reg.h	Sun Dec  1 12:24:57 2013	(r258794)
+++ projects/sendfile/sys/dev/drm/i915_reg.h	Sun Dec  1 14:03:03 2013	(r258795)
@@ -349,7 +349,7 @@ __FBSDID("$FreeBSD$");
 #define   VGA1_PD_P1_MASK	(0x1f << 8)
 #define DPLL_A	0x06014
 #define DPLL_B	0x06018
-#define   DPLL_VCO_ENABLE		(1 << 31)
+#define   DPLL_VCO_ENABLE		(1U << 31)
 #define   DPLL_DVO_HIGH_SPEED		(1 << 30)
 #define   DPLL_SYNCLOCK_ENABLE		(1 << 29)
 #define   DPLL_VGA_MODE_DIS		(1 << 28)
@@ -653,7 +653,7 @@ __FBSDID("$FreeBSD$");
 /* SDVO port control */
 #define SDVOB			0x61140
 #define SDVOC			0x61160
-#define   SDVO_ENABLE		(1 << 31)
+#define   SDVO_ENABLE		(1U << 31)
 #define   SDVO_PIPE_B_SELECT	(1 << 30)
 #define   SDVO_STALL_SELECT	(1 << 29)
 #define   SDVO_INTERRUPT_ENABLE	(1 << 26)
@@ -690,7 +690,7 @@ __FBSDID("$FreeBSD$");

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list