Merge branch 'master' into 2.262.26

2 files changed, 23 insertions, 0 deletions

diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h
index 350a673..ad34e5d 100644
--- a/include/pthread/pthread.h
+++ b/include/pthread/pthread.h
@@ -271,6 +271,11 @@ extern pthread_t pthread_self (void) __THROW;
 #define PTHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_TIMED_NP
 #endif
 
+#ifdef __USE_XOPEN2K
+#define PTHREAD_MUTEX_STALLED __PTHREAD_MUTEX_STALLED
+#define PTHREAD_MUTEX_ROBUST __PTHREAD_MUTEX_ROBUST
+#endif
+
 #include <bits/mutex-attr.h>
 
 /* Initialize the mutex attribute object in *ATTR to the default
@@ -399,6 +404,18 @@ extern int pthread_mutex_setprioceiling (pthread_mutex_t *__restrict __mutex,
 	__THROW __nonnull ((1, 3));
 #endif
 
+#ifdef __USE_XOPEN2K8
+
+/* Declare the state protected by robust mutex MTXP as consistent. */
+extern int pthread_mutex_consistent (pthread_mutex_t *__mtxp)
+  __THROW __nonnull ((1));
+
+#  ifdef __USE_GNU
+extern int pthread_mutex_consistent_np (pthread_mutex_t *__mtxp)
+  __THROW __nonnull ((1));
+#  endif
+#endif
+
 
 
 /* Condition attributes.  */
diff --git a/include/pthread/pthreadtypes.h b/include/pthread/pthreadtypes.h
index 33bd009..d8aed4d 100644
--- a/include/pthread/pthreadtypes.h
+++ b/include/pthread/pthreadtypes.h
@@ -77,6 +77,12 @@ enum __pthread_mutex_type
     __PTHREAD_MUTEX_RECURSIVE
   };
 
+enum __pthread_mutex_robustness
+  {
+    __PTHREAD_MUTEX_STALLED,
+    __PTHREAD_MUTEX_ROBUST = 0x100
+  };
+
 #include <bits/mutex-attr.h>
 typedef struct __pthread_mutexattr pthread_mutexattr_t;