Merge sync of head

16 files changed, 178 insertions, 91 deletions

diff --git a/share/man/man3/ATOMIC_VAR_INIT.3 b/share/man/man3/ATOMIC_VAR_INIT.3
index f6c0a5d..e278602 100644
--- a/share/man/man3/ATOMIC_VAR_INIT.3
+++ b/share/man/man3/ATOMIC_VAR_INIT.3
@@ -297,5 +297,5 @@ These macros attempt to conform to
 These macros appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq Mt ed@FreeBSD.org
+.An \&Ed Schouten Aq Mt ed@FreeBSD.org
 .An David Chisnall Aq Mt theraven@FreeBSD.org
diff --git a/share/man/man3/makedev.3 b/share/man/man3/makedev.3
index b32d69e..87ca953 100644
--- a/share/man/man3/makedev.3
+++ b/share/man/man3/makedev.3
@@ -85,6 +85,6 @@ macro returns a device minor number whose value can span the complete
 range of an
 .Vt int .
 .Sh SEE ALSO
-.Xr devfs 5 ,
+.Xr mknod 2 ,
 .Xr devname 3 ,
-.Xr mknod 2
+.Xr devfs 5
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index 78a9153..9a0c5c8 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -484,14 +484,14 @@ Threaded applications are linked with this library.
 .Xr pthread_cancel 3 ,
 .Xr pthread_cleanup_pop 3 ,
 .Xr pthread_cleanup_push 3 ,
-.Xr pthread_condattr_destroy 3 ,
-.Xr pthread_condattr_init 3 ,
 .Xr pthread_cond_broadcast 3 ,
 .Xr pthread_cond_destroy 3 ,
 .Xr pthread_cond_init 3 ,
 .Xr pthread_cond_signal 3 ,
 .Xr pthread_cond_timedwait 3 ,
 .Xr pthread_cond_wait 3 ,
+.Xr pthread_condattr_destroy 3 ,
+.Xr pthread_condattr_init 3 ,
 .Xr pthread_create 3 ,
 .Xr pthread_detach 3 ,
 .Xr pthread_equal 3 ,
@@ -500,6 +500,11 @@ Threaded applications are linked with this library.
 .Xr pthread_join 3 ,
 .Xr pthread_key_delete 3 ,
 .Xr pthread_kill 3 ,
+.Xr pthread_mutex_destroy 3 ,
+.Xr pthread_mutex_init 3 ,
+.Xr pthread_mutex_lock 3 ,
+.Xr pthread_mutex_trylock 3 ,
+.Xr pthread_mutex_unlock 3 ,
 .Xr pthread_mutexattr_destroy 3 ,
 .Xr pthread_mutexattr_getprioceiling 3 ,
 .Xr pthread_mutexattr_getprotocol 3 ,
@@ -508,21 +513,16 @@ Threaded applications are linked with this library.
 .Xr pthread_mutexattr_setprioceiling 3 ,
 .Xr pthread_mutexattr_setprotocol 3 ,
 .Xr pthread_mutexattr_settype 3 ,
-.Xr pthread_mutex_destroy 3 ,
-.Xr pthread_mutex_init 3 ,
-.Xr pthread_mutex_lock 3 ,
-.Xr pthread_mutex_trylock 3 ,
-.Xr pthread_mutex_unlock 3 ,
 .Xr pthread_once 3 ,
-.Xr pthread_rwlockattr_destroy 3 ,
-.Xr pthread_rwlockattr_getpshared 3 ,
-.Xr pthread_rwlockattr_init 3 ,
-.Xr pthread_rwlockattr_setpshared 3 ,
 .Xr pthread_rwlock_destroy 3 ,
 .Xr pthread_rwlock_init 3 ,
 .Xr pthread_rwlock_rdlock 3 ,
 .Xr pthread_rwlock_unlock 3 ,
 .Xr pthread_rwlock_wrlock 3 ,
+.Xr pthread_rwlockattr_destroy 3 ,
+.Xr pthread_rwlockattr_getpshared 3 ,
+.Xr pthread_rwlockattr_init 3 ,
+.Xr pthread_rwlockattr_setpshared 3 ,
 .Xr pthread_self 3 ,
 .Xr pthread_setcancelstate 3 ,
 .Xr pthread_setcanceltype 3 ,
diff --git a/share/man/man3/pthread_attr.3 b/share/man/man3/pthread_attr.3
index a99d32d..d6d9801 100644
--- a/share/man/man3/pthread_attr.3
+++ b/share/man/man3/pthread_attr.3
@@ -208,8 +208,8 @@ Invalid or unsupported value for
 .Fa contentionscope .
 .El
 .Sh SEE ALSO
-.Xr pthread_attr_get_np 3 ,
 .Xr pthread_attr_affinity_np 3 ,
+.Xr pthread_attr_get_np 3 ,
 .Xr pthread_create 3
 .Sh STANDARDS
 .Fn pthread_attr_init ,
diff --git a/share/man/man3/pthread_cond_init.3 b/share/man/man3/pthread_cond_init.3
index 38843a7..415ce02 100644
--- a/share/man/man3/pthread_cond_init.3
+++ b/share/man/man3/pthread_cond_init.3
@@ -70,12 +70,12 @@ The system temporarily lacks the resources to create another condition
 variable.
 .El
 .Sh SEE ALSO
-.Xr pthread_condattr 3 ,
 .Xr pthread_cond_broadcast 3 ,
 .Xr pthread_cond_destroy 3 ,
 .Xr pthread_cond_signal 3 ,
 .Xr pthread_cond_timedwait 3 ,
-.Xr pthread_cond_wait 3
+.Xr pthread_cond_wait 3 ,
+.Xr pthread_condattr 3
 .Sh STANDARDS
 The
 .Fn pthread_cond_init
diff --git a/share/man/man3/pthread_getspecific.3 b/share/man/man3/pthread_getspecific.3
index d59003f..3657e13 100644
--- a/share/man/man3/pthread_getspecific.3
+++ b/share/man/man3/pthread_getspecific.3
@@ -64,6 +64,11 @@ is undefined.
 The
 .Fn pthread_getspecific
 function may be called from a thread-specific data destructor function.
+A call to
+.Fn pthread_getspecific
+for the thread-specific data key being destroyed returns the value NULL,
+unless the value is changed (after the destructor starts) by a call to
+.Fn pthread_setspecific .
 .Sh RETURN VALUES
 The
 .Fn pthread_getspecific
diff --git a/share/man/man3/pthread_mutex_init.3 b/share/man/man3/pthread_mutex_init.3
index 10a026b..a5a1eca 100644
--- a/share/man/man3/pthread_mutex_init.3
+++ b/share/man/man3/pthread_mutex_init.3
@@ -66,11 +66,11 @@ is invalid.
 The process cannot allocate enough memory to create another mutex.
 .El
 .Sh SEE ALSO
-.Xr pthread_mutexattr 3 ,
 .Xr pthread_mutex_destroy 3 ,
 .Xr pthread_mutex_lock 3 ,
 .Xr pthread_mutex_trylock 3 ,
-.Xr pthread_mutex_unlock 3
+.Xr pthread_mutex_unlock 3 ,
+.Xr pthread_mutexattr 3
 .Sh STANDARDS
 The
 .Fn pthread_mutex_init
diff --git a/share/man/man3/pthread_mutexattr_getkind_np.3 b/share/man/man3/pthread_mutexattr_getkind_np.3
index 548045b..fe5435f 100644
--- a/share/man/man3/pthread_mutexattr_getkind_np.3
+++ b/share/man/man3/pthread_mutexattr_getkind_np.3
@@ -75,7 +75,7 @@ The value specified by
 is invalid.
 .El
 .Sh SEE ALSO
-.Xr pthread_mutexattr_gettype 3 ,
-.Xr pthread_mutexattr_settype 3 ,
 .Xr pthread_mutex_destroy 3 ,
-.Xr pthread_mutex_init 3
+.Xr pthread_mutex_init 3 ,
+.Xr pthread_mutexattr_gettype 3 ,
+.Xr pthread_mutexattr_settype 3
diff --git a/share/man/man3/pthread_rwlock_init.3 b/share/man/man3/pthread_rwlock_init.3
index cf8cc7e..2617c43 100644
--- a/share/man/man3/pthread_rwlock_init.3
+++ b/share/man/man3/pthread_rwlock_init.3
@@ -85,9 +85,9 @@ The value specified by
 is invalid.
 .El
 .Sh SEE ALSO
+.Xr pthread_rwlock_destroy 3 ,
 .Xr pthread_rwlockattr_init 3 ,
-.Xr pthread_rwlockattr_setpshared 3 ,
-.Xr pthread_rwlock_destroy 3
+.Xr pthread_rwlockattr_setpshared 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlock_init
diff --git a/share/man/man3/pthread_rwlockattr_getpshared.3 b/share/man/man3/pthread_rwlockattr_getpshared.3
index 3fe5de1..3e2f451 100644
--- a/share/man/man3/pthread_rwlockattr_getpshared.3
+++ b/share/man/man3/pthread_rwlockattr_getpshared.3
@@ -71,9 +71,9 @@ The value specified by
 is invalid.
 .El
 .Sh SEE ALSO
+.Xr pthread_rwlock_init 3 ,
 .Xr pthread_rwlockattr_init 3 ,
-.Xr pthread_rwlockattr_setpshared 3 ,
-.Xr pthread_rwlock_init 3
+.Xr pthread_rwlockattr_setpshared 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlockattr_getpshared
diff --git a/share/man/man3/pthread_rwlockattr_init.3 b/share/man/man3/pthread_rwlockattr_init.3
index 54d319f..1cce9cd 100644
--- a/share/man/man3/pthread_rwlockattr_init.3
+++ b/share/man/man3/pthread_rwlockattr_init.3
@@ -55,10 +55,10 @@ function will fail if:
 Insufficient memory exists to initialize the attribute object.
 .El
 .Sh SEE ALSO
+.Xr pthread_rwlock_init 3 ,
 .Xr pthread_rwlockattr_destroy 3 ,
 .Xr pthread_rwlockattr_getpshared 3 ,
-.Xr pthread_rwlockattr_setpshared 3 ,
-.Xr pthread_rwlock_init 3
+.Xr pthread_rwlockattr_setpshared 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlockattr_init
diff --git a/share/man/man3/pthread_rwlockattr_setpshared.3 b/share/man/man3/pthread_rwlockattr_setpshared.3
index 36bcc69..ccfe886 100644
--- a/share/man/man3/pthread_rwlockattr_setpshared.3
+++ b/share/man/man3/pthread_rwlockattr_setpshared.3
@@ -75,9 +75,9 @@ or
 is invalid.
 .El
 .Sh SEE ALSO
+.Xr pthread_rwlock_init 3 ,
 .Xr pthread_rwlockattr_getpshared 3 ,
-.Xr pthread_rwlockattr_init 3 ,
-.Xr pthread_rwlock_init 3
+.Xr pthread_rwlockattr_init 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlockattr_setpshared
diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3
index ef6a1c1..fc412de 100644
--- a/share/man/man3/pthread_testcancel.3
+++ b/share/man/man3/pthread_testcancel.3
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.Dd June 11, 2013
+.Dd April 16, 2015
 .Dt PTHREAD_TESTCANCEL 3
 .Os
 .Sh NAME
@@ -100,68 +100,73 @@ type will be in effect.
 .Ss Cancellation Points
 Cancellation points will occur when a thread is executing the following
 functions:
-.Fn accept ,
-.Fn accept4 ,
-.Fn aio_suspend ,
-.Fn connect ,
-.Fn close ,
-.Fn creat ,
-.Fn fsync ,
-.Fn mq_receive ,
-.Fn mq_send ,
-.Fn mq_timedreceive ,
-.Fn mq_timedsend ,
-.Fn msync ,
-.Fn nanosleep ,
-.Fn open ,
-.Fn openat ,
-.Fn pause ,
-.Fn poll ,
-.Fn pselect ,
-.Fn pthread_cond_timedwait ,
-.Fn pthread_cond_wait ,
-.Fn pthread_join ,
-.Fn pthread_testcancel ,
-.Fn read ,
-.Fn readv ,
-.Fn recv ,
-.Fn recvfrom ,
-.Fn recvmsg ,
-.Fn select ,
-.Fn sem_timedwait ,
-.Fn sem_wait ,
-.Fn send ,
-.Fn sendmsg ,
-.Fn sendto ,
-.Fn sigsuspend ,
-.Fn sigtimedwait ,
-.Fn sigwaitinfo ,
-.Fn sigwait ,
-.Fn sleep ,
-.Fn system ,
-.Fn tcdrain ,
-.Fn usleep ,
-.Fn wait ,
-.Fn wait3 ,
-.Fn wait4 ,
-.Fn waitpid ,
-.Fn write ,
-.Fn writev .
+.Bl -tag -width "Fn pthread_cond_timedwait" -compact
+.It Fn accept
+.It Fn accept4
+.It Fn aio_suspend
+.It Fn connect
+.It Fn close
+.It Fn creat
+.It Fn fcntl
 The
 .Fn fcntl
 function is a cancellation point if
 .Fa cmd
 is
 .Dv F_SETLKW .
-.Sh RETURN VALUES
-If successful, the
-.Fn pthread_setcancelstate
-and
-.Fn pthread_setcanceltype
-functions will return zero.
-Otherwise, an error number shall be returned to
-indicate the error.
-.Pp
+.It Fn fsync
+.It Fn kevent
+The
+.Fn kevent
+function is a cancellation point if it is potentially blocking,
+i.e. when the
+.Fa nevents
+argument  is non-zero.
+.It Fn mq_receive
+.It Fn mq_send
+.It Fn mq_timedreceive
+.It Fn mq_timedsend
+.It Fn msync
+.It Fn nanosleep
+.It Fn open
+.It Fn openat
+.It Fn pause
+.It Fn poll
+.It Fn ppoll
+.It Fn pselect
+.It Fn pthread_cond_timedwait
+.It Fn pthread_cond_wait
+.It Fn pthread_join
+.It Fn pthread_testcancel
+.It Fn read
+.It Fn readv
+.It Fn recv
+.It Fn recvfrom
+.It Fn recvmsg
+.It Fn select
+.It Fn sem_timedwait
+.It Fn sem_wait
+.It Fn send
+.It Fn sendmsg
+.It Fn sendto
+.It Fn sigsuspend
+.It Fn sigtimedwait
+.It Fn sigwaitinfo
+.It Fn sigwait
+.It Fn sleep
+.It Fn system
+.It Fn tcdrain
+.It Fn usleep
+.It Fn wait
+.It Fn wait3
+.It Fn wait4
+.It Fn wait6
+.It Fn waitid
+.It Fn waitpid
+.It Fn write
+.It Fn writev
+.El
+.Sh NOTES
 The
 .Fn pthread_setcancelstate
 and
@@ -203,6 +208,14 @@ entry to the object.
 .Pp
 Finally, only functions that are cancel-safe may be called from a thread that
 is asynchronously cancelable.
+.Sh RETURN VALUES
+If successful, the
+.Fn pthread_setcancelstate
+and
+.Fn pthread_setcanceltype
+functions will return zero.
+Otherwise, an error number shall be returned to
+indicate the error.
 .Sh ERRORS
 The function
 .Fn pthread_setcancelstate
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index 6c6cee3..fbd1a06 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -28,7 +28,7 @@
 .\"	@(#)queue.3	8.2 (Berkeley) 1/24/94
 .\" $FreeBSD$
 .\"
-.Dd June 17, 2013
+.Dd April 16, 2015
 .Dt QUEUE 3
 .Os
 .Sh NAME
@@ -147,7 +147,7 @@ lists and tail queues
 .Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME"
-.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME"
+.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME"
diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3
index 0feb13c..be49dfa 100644
--- a/share/man/man3/tgmath.3
+++ b/share/man/man3/tgmath.3
@@ -115,7 +115,7 @@ complex value to a generic argument invokes undefined behaviour:
 .It Fn erf Ta Fn frexp Ta Fn logb Ta Fn scalbn
 .It Fn erfc Ta Fn hypot Ta Fn lrint Ta Fn scalbln
 .It Fn exp2 Ta Fn ilogb Ta Fn lround Ta Fn tgamma
-.It Fn expm1 Ta Fn ldexp Ta Fn nextbyint Ta Fn trunc
+.It Fn expm1 Ta Fn ldexp Ta Fn nearbyint Ta Fn trunc
 .It Fn fdim Ta Fn lgamma Ta Fn nextafter Ta \&
 .It Fn floor Ta Fn llrint Ta Fn nexttoward Ta \&
 .El
diff --git a/share/man/man3/tree.3 b/share/man/man3/tree.3
index 2e9c63c..ea70506 100644
--- a/share/man/man3/tree.3
+++ b/share/man/man3/tree.3
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 10, 2013
+.Dd January 24, 2015
 .Dt TREE 3
 .Os
 .Sh NAME
@@ -53,8 +53,26 @@
 .Nm SPLAY_REMOVE ,
 .Nm RB_PROTOTYPE ,
 .Nm RB_PROTOTYPE_STATIC ,
+.Nm RB_PROTOTYPE_INSERT ,
+.Nm RB_PROTOTYPE_INSERT_COLOR ,
+.Nm RB_PROTOTYPE_REMOVE ,
+.Nm RB_PROTOTYPE_REMOVE_COLOR ,
+.Nm RB_PROTOTYPE_FIND ,
+.Nm RB_PROTOTYPE_NFIND ,
+.Nm RB_PROTOTYPE_NEXT ,
+.Nm RB_PROTOTYPE_PREV ,
+.Nm RB_PROTOTYPE_MINMAX ,
 .Nm RB_GENERATE ,
 .Nm RB_GENERATE_STATIC ,
+.Nm RB_GENERATE_INSERT ,
+.Nm RB_GENERATE_INSERT_COLOR ,
+.Nm RB_GENERATE_REMOVE ,
+.Nm RB_GENERATE_REMOVE_COLOR ,
+.Nm RB_GENERATE_FIND ,
+.Nm RB_GENERATE_NFIND ,
+.Nm RB_GENERATE_NEXT ,
+.Nm RB_GENERATE_PREV ,
+.Nm RB_GENERATE_MINMAX ,
 .Nm RB_ENTRY ,
 .Nm RB_HEAD ,
 .Nm RB_INITIALIZER ,
@@ -111,8 +129,26 @@
 .Fn SPLAY_REMOVE NAME "SPLAY_HEAD *head" "struct TYPE *elm"
 .Fn RB_PROTOTYPE NAME TYPE FIELD CMP
 .Fn RB_PROTOTYPE_STATIC NAME TYPE FIELD CMP
+.Fn RB_PROTOTYPE_INSERT NAME TYPE ATTR
+.Fn RB_PROTOTYPE_INSERT_COLOR NAME TYPE ATTR
+.Fn RB_PROTOTYPE_REMOVE NAME TYPE ATTR
+.Fn RB_PROTOTYPE_REMOVE_COLOR NAME TYPE ATTR
+.Fn RB_PROTOTYPE_FIND NAME TYPE ATTR
+.Fn RB_PROTOTYPE_NFIND NAME TYPE ATTR
+.Fn RB_PROTOTYPE_NEXT NAME TYPE ATTR
+.Fn RB_PROTOTYPE_PREV NAME TYPE ATTR
+.Fn RB_PROTOTYPE_MINMAX NAME TYPE ATTR
 .Fn RB_GENERATE NAME TYPE FIELD CMP
 .Fn RB_GENERATE_STATIC NAME TYPE FIELD CMP
+.Fn RB_GENERATE_INSERT NAME TYPE FIELD CMP ATTR
+.Fn RB_GENERATE_INSERT_COLOR NAME TYPE FIELD ATTR
+.Fn RB_GENERATE_REMOVE NAME TYPE FIELD ATTR
+.Fn RB_GENERATE_REMOVE_COLOR NAME TYPE FIELD ATTR
+.Fn RB_GENERATE_FIND NAME TYPE FIELD CMP ATTR
+.Fn RB_GENERATE_NFIND NAME TYPE FIELD CMP ATTR
+.Fn RB_GENERATE_NEXT NAME TYPE FIELD ATTR
+.Fn RB_GENERATE_PREV NAME TYPE FIELD ATTR
+.Fn RB_GENERATE_MINMAX NAME TYPE FIELD ATTR
 .Fn RB_ENTRY TYPE
 .Fn RB_HEAD HEADNAME TYPE
 .Fn RB_INITIALIZER "RB_HEAD *head"
@@ -377,6 +413,27 @@ The
 .Fa FIELD
 argument is the name of the element defined by
 .Fn RB_ENTRY .
+Individual prototypes can be declared with
+.Fn RB_PROTOTYPE_INSERT ,
+.Fn RB_PROTOTYPE_INSERT_COLOR ,
+.Fn RB_PROTOTYPE_REMOVE ,
+.Fn RB_PROTOTYPE_REMOVE_COLOR ,
+.Fn RB_PROTOTYPE_FIND ,
+.Fn RB_PROTOTYPE_NFIND ,
+.Fn RB_PROTOTYPE_NEXT ,
+.Fn RB_PROTOTYPE_PREV ,
+and
+.Fn RB_PROTOTYPE_MINMAX
+in case not all functions are required.  The individual prototype macros expect
+.Fa NAME ,
+.Fa TYPE ,
+and
+.Fa ATTR
+arguments.  The
+.Fa ATTR
+argument must be empty for global functions or
+.Fa static
+for static functions.
 .Pp
 The function bodies are generated with the
 .Fn RB_GENERATE
@@ -388,6 +445,18 @@ These macros take the same arguments as the
 and
 .Fn RB_PROTOTYPE_STATIC
 macros, but should be used only once.
+As an alternative individual function bodies are generated with the
+.Fn RB_GENERATE_INSERT ,
+.Fn RB_GENERATE_INSERT_COLOR ,
+.Fn RB_GENERATE_REMOVE ,
+.Fn RB_GENERATE_REMOVE_COLOR ,
+.Fn RB_GENERATE_FIND ,
+.Fn RB_GENERATE_NFIND ,
+.Fn RB_GENERATE_NEXT ,
+.Fn RB_GENERATE_PREV ,
+and
+.Fn RB_GENERATE_MINMAX
+macros.
 .Pp
 Finally,
 the