Index: share/man/man4
===================================================================
--- share/man/man4	(revision 258865)
+++ share/man/man4	(working copy)

Property changes on: share/man/man4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/share/man/man4:r258768
Index: share/man/man4/capsicum.4
===================================================================
--- share/man/man4/capsicum.4	(revision 258865)
+++ share/man/man4/capsicum.4	(working copy)
@@ -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
Index: share/man/man4/procdesc.4
===================================================================
--- share/man/man4/procdesc.4	(revision 258865)
+++ share/man/man4/procdesc.4	(working copy)
@@ -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,
Index: sys
===================================================================
--- sys	(revision 258865)
+++ sys	(working copy)

Property changes on: sys
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys:r258768
Index: sys/sparc64/conf/GENERIC
===================================================================
--- sys/sparc64/conf/GENERIC	(revision 258865)
+++ sys/sparc64/conf/GENERIC	(working copy)
@@ -63,7 +63,6 @@ options 	HWPMC_HOOKS		# Necessary kernel hooks for
 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 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
Index: sys/ia64/conf/GENERIC
===================================================================
--- sys/ia64/conf/GENERIC	(revision 258865)
+++ sys/ia64/conf/GENERIC	(working copy)
@@ -46,7 +46,6 @@ options 	NFS_ROOT	# NFS usable as root device
 options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
 options 	PREEMPTION	# Enable kernel thread preemption
 options 	PRINTF_BUFR_SIZE=128  # Printf buffering to limit interspersion
-options 	PROCDESC	# Support for process descriptors
 options 	PROCFS		# Process filesystem (/proc)
 options 	PSEUDOFS	# Pseudo-filesystem framework
 options 	SCHED_ULE	# ULE scheduler
Index: sys/pc98/conf/GENERIC
===================================================================
--- sys/pc98/conf/GENERIC	(revision 258865)
+++ sys/pc98/conf/GENERIC	(working copy)
@@ -65,7 +65,6 @@ options 	HWPMC_HOOKS		# Necessary kernel hooks for
 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 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 options 	KDB			# Kernel debugger related code
Index: sys/i386/conf/GENERIC
===================================================================
--- sys/i386/conf/GENERIC	(revision 258865)
+++ sys/i386/conf/GENERIC	(working copy)
@@ -67,7 +67,6 @@ options 	HWPMC_HOOKS		# Necessary kernel hooks for
 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_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
Index: sys/amd64/conf/GENERIC
===================================================================
--- sys/amd64/conf/GENERIC	(revision 258865)
+++ sys/amd64/conf/GENERIC	(working copy)
@@ -66,7 +66,6 @@ options 	HWPMC_HOOKS		# Necessary kernel hooks for
 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
Index: sys/powerpc/conf/GENERIC
===================================================================
--- sys/powerpc/conf/GENERIC	(revision 258865)
+++ sys/powerpc/conf/GENERIC	(working copy)
@@ -70,7 +70,6 @@ options 	HWPMC_HOOKS		# Necessary kernel hooks for
 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_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
Index: sys/conf
===================================================================
--- sys/conf	(revision 258865)
+++ sys/conf	(working copy)

Property changes on: sys/conf
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/conf:r258768
Index: sys/conf/options
===================================================================
--- sys/conf/options	(revision 258865)
+++ sys/conf/options	(working copy)
@@ -164,7 +164,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
Index: sys/conf/NOTES
===================================================================
--- sys/conf/NOTES	(revision 258865)
+++ sys/conf/NOTES	(working copy)
@@ -1168,9 +1168,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
Index: sys/kern/kern_exit.c
===================================================================
--- sys/kern/kern_exit.c	(revision 258865)
+++ sys/kern/kern_exit.c	(working copy)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 #include "opt_kdtrace.h"
 #include "opt_ktrace.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -501,9 +500,7 @@ exit1(struct thread *td, int rv)
 	 * procdesc_exit() to serialize concurrent calls to close() and
 	 * exit().
 	 */
-#ifdef PROCDESC
 	if (p->p_procdesc == NULL || procdesc_exit(p)) {
-#endif
 		/*
 		 * Notify parent that we're gone.  If parent has the
 		 * PS_NOCLDWAIT flag set, or if the handler is set to SIG_IGN,
@@ -540,10 +537,8 @@ exit1(struct thread *td, int rv)
 			else	/* LINUX thread */
 				kern_psignal(p->p_pptr, p->p_sigparent);
 		}
-#ifdef PROCDESC
 	} else
 		PROC_LOCK(p->p_pptr);
-#endif
 	sx_xunlock(&proctree_lock);
 
 	/*
@@ -808,10 +803,8 @@ proc_reap(struct thread *td, struct proc *p, int *
 	clear_orphan(p);
 	PROC_UNLOCK(p);
 	leavepgrp(p);
-#ifdef PROCDESC
 	if (p->p_procdesc != NULL)
 		procdesc_reap(p);
-#endif
 	sx_xunlock(&proctree_lock);
 
 	/*
Index: sys/kern/kern_descrip.c
===================================================================
--- sys/kern/kern_descrip.c	(revision 258865)
+++ sys/kern/kern_descrip.c	(working copy)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3115,11 +3114,9 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS)
 			tp = fp->f_data;
 			break;
 
-#ifdef PROCDESC
 		case DTYPE_PROCDESC:
 			kif->kf_type = KF_TYPE_PROCDESC;
 			break;
-#endif
 
 		default:
 			kif->kf_type = KF_TYPE_UNKNOWN;
@@ -3485,12 +3482,10 @@ kern_proc_filedesc_out(struct proc *p,  struct sbu
 			data = fp->f_data;
 			break;
 
-#ifdef PROCDESC
 		case DTYPE_PROCDESC:
 			type = KF_TYPE_PROCDESC;
 			data = fp->f_data;
 			break;
-#endif
 
 		default:
 			type = KF_TYPE_UNKNOWN;
Index: sys/kern/sys_procdesc.c
===================================================================
--- sys/kern/sys_procdesc.c	(revision 258865)
+++ sys/kern/sys_procdesc.c	(working copy)
@@ -61,8 +61,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_procdesc.h"
-
 #include <sys/param.h>
 #include <sys/capability.h>
 #include <sys/fcntl.h>
@@ -85,8 +83,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/uma.h>
 
-#ifdef PROCDESC
-
 FEATURE(process_descriptors, "Process Descriptors");
 
 static uma_zone_t procdesc_zone;
@@ -522,14 +518,3 @@ procdesc_chown(struct file *fp, uid_t uid, gid_t g
 
 	return (EOPNOTSUPP);
 }
-
-#else /* !PROCDESC */
-
-int
-sys_pdgetpid(struct thread *td, struct pdgetpid_args *uap)
-{
-
-	return (ENOSYS);
-}
-
-#endif /* PROCDESC */
Index: sys/kern/kern_sig.c
===================================================================
--- sys/kern/kern_sig.c	(revision 258865)
+++ sys/kern/kern_sig.c	(working copy)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_core.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1724,7 +1723,6 @@ sys_pdkill(td, uap)
 	struct thread *td;
 	struct pdkill_args *uap;
 {
-#ifdef PROCDESC
 	struct proc *p;
 	cap_rights_t rights;
 	int error;
@@ -1744,9 +1742,6 @@ sys_pdkill(td, uap)
 		kern_psignal(p, uap->signum);
 	PROC_UNLOCK(p);
 	return (error);
-#else
-	return (ENOSYS);
-#endif
 }
 
 #if defined(COMPAT_43)
Index: sys/kern/kern_fork.c
===================================================================
--- sys/kern/kern_fork.c	(revision 258865)
+++ sys/kern/kern_fork.c	(working copy)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,7 +118,6 @@ sys_pdfork(td, uap)
 	struct thread *td;
 	struct pdfork_args *uap;
 {
-#ifdef PROCDESC
 	int error, fd;
 	struct proc *p2;
 
@@ -136,9 +134,6 @@ sys_pdfork(td, uap)
 		error = copyout(&fd, uap->fdp, sizeof(fd));
 	}
 	return (error);
-#else
-	return (ENOSYS);
-#endif
 }
 
 /* ARGSUSED */
@@ -656,7 +651,6 @@ do_fork(struct thread *td, int flags, struct proc
 		    p2->p_vmspace->vm_ssize);
 	}
 
-#ifdef PROCDESC
 	/*
 	 * Associate the process descriptor with the process before anything
 	 * can happen that might cause that process to need the descriptor.
@@ -664,7 +658,6 @@ do_fork(struct thread *td, int flags, struct proc
 	 */
 	if (flags & RFPROCDESC)
 		procdesc_new(p2, pdflags);
-#endif
 
 	/*
 	 * Both processes are set up, now check if any loadable modules want
@@ -759,9 +752,7 @@ fork1(struct thread *td, int flags, int pages, str
 	int error;
 	static int curfail;
 	static struct timeval lastfail;
-#ifdef PROCDESC
 	struct file *fp_procdesc = NULL;
-#endif
 
 	/* Check for the undefined or unimplemented flags. */
 	if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK))) != 0)
@@ -779,7 +770,6 @@ fork1(struct thread *td, int flags, int pages, str
 	if ((flags & RFTSIGZMB) != 0 && (u_int)RFTSIGNUM(flags) > _SIG_MAXSIG)
 		return (EINVAL);
 
-#ifdef PROCDESC
 	if ((flags & RFPROCDESC) != 0) {
 		/* Can't not create a process yet get a process descriptor. */
 		if ((flags & RFPROC) == 0)
@@ -789,7 +779,6 @@ fork1(struct thread *td, int flags, int pages, str
 		if (procdescp == NULL)
 			return (EINVAL);
 	}
-#endif
 
 	p1 = td->td_proc;
 
@@ -802,7 +791,6 @@ fork1(struct thread *td, int flags, int pages, str
 		return (fork_norfproc(td, flags));
 	}
 
-#ifdef PROCDESC
 	/*
 	 * If required, create a process descriptor in the parent first; we
 	 * will abandon it if something goes wrong. We don't finit() until
@@ -813,7 +801,6 @@ fork1(struct thread *td, int flags, int pages, str
 		if (error != 0)
 			return (error);
 	}
-#endif
 
 	mem_charged = 0;
 	vm2 = NULL;
@@ -920,12 +907,10 @@ fork1(struct thread *td, int flags, int pages, str
 		 * Return child proc pointer to parent.
 		 */
 		*procp = newproc;
-#ifdef PROCDESC
 		if (flags & RFPROCDESC) {
 			procdesc_finit(newproc->p_procdesc, fp_procdesc);
 			fdrop(fp_procdesc, td);
 		}
-#endif
 		racct_proc_fork_done(newproc);
 		return (0);
 	}
@@ -945,12 +930,10 @@ fail1:
 	if (vm2 != NULL)
 		vmspace_free(vm2);
 	uma_zfree(proc_zone, newproc);
-#ifdef PROCDESC
 	if ((flags & RFPROCDESC) != 0 && fp_procdesc != NULL) {
 		fdclose(td->td_proc->p_fd, fp_procdesc, *procdescp, td);
 		fdrop(fp_procdesc, td);
 	}
-#endif
 	pause("fork", hz / 2);
 	return (error);
 }
Index: lib/libc
===================================================================
--- lib/libc	(revision 258865)
+++ lib/libc	(working copy)

Property changes on: lib/libc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/lib/libc:r258768
Index: lib/libc/sys/pdfork.2
===================================================================
--- lib/libc/sys/pdfork.2	(revision 258865)
+++ lib/libc/sys/pdfork.2	(working copy)
@@ -125,12 +125,6 @@ is set; if the process is still alive and this is
 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
Index: usr.sbin/rwhod
===================================================================
--- usr.sbin/rwhod	(revision 258865)
+++ usr.sbin/rwhod	(working copy)

Property changes on: usr.sbin/rwhod
___________________________________________________________________
Added: svn:mergeinfo
   Merged /projects/quota64/usr.sbin/rwhod:r184125-207707
   Merged /projects/multi-fibv6/head/usr.sbin/rwhod:r230929-231848
   Merged /head/usr.sbin/rwhod:r256365,256865,258768
   Merged /vendor/resolver/dist/usr.sbin/rwhod:r1540-186085
   Merged /projects/largeSMP/usr.sbin/rwhod:r221273-222812,222815-223757
   Merged /projects/head_mfi/usr.sbin/rwhod:r233621
   Merged /projects/random_number_generator/usr.sbin/rwhod:r254613-255353
Index: usr.sbin/rwhod/rwhod.c
===================================================================
--- usr.sbin/rwhod/rwhod.c	(revision 258865)
+++ usr.sbin/rwhod/rwhod.c	(working copy)
@@ -281,7 +281,7 @@ main(int argc, char *argv[])
 		} else if (pid_child_receiver == -1) {
 			if (errno == ENOSYS) {
 				syslog(LOG_ERR,
-				    "The pdfork(2) system call is not available; recompile the kernel with options PROCDESC");
+				    "The pdfork(2) system call is not available - kernel too old.");
 			} else {
 				syslog(LOG_ERR, "pdfork: %m");
 			}