86045f2d65
Upstream commit: 33adeaa3e2b9143c38884bc5aa65ded222ed274e - nptl: Avoid setxid deadlock with blocked signals in thread exit [BZ #28361] - Use support_open_dev_null_range io/tst-closefrom, misc/tst-close_range, and posix/tst-spawn5 (BZ #28260) - support: Add support_open_dev_null_range - nptl: Fix type of pthread_mutexattr_getrobust_np, pthread_mutexattr_setrobust_np (bug 28036) - nptl: pthread_kill needs to return ESRCH for old programs (bug 19193)
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
commit 8b8a1d0b7375c547ae905917a03743ed6759c5bc
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Tue Sep 21 07:12:56 2021 +0200
|
|
|
|
nptl: Fix type of pthread_mutexattr_getrobust_np, pthread_mutexattr_setrobust_np (bug 28036)
|
|
|
|
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
|
|
Tested-by: Carlos O'Donell <carlos@redhat.com>
|
|
(cherry picked from commit f3e664563361dc17530113b3205998d1f19dc4d9)
|
|
|
|
diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
|
|
index f1b7f2bdc6062c3e..43146e91c9d9579b 100644
|
|
--- a/sysdeps/nptl/pthread.h
|
|
+++ b/sysdeps/nptl/pthread.h
|
|
@@ -933,7 +933,7 @@ extern int pthread_mutexattr_getrobust (const pthread_mutexattr_t *__attr,
|
|
# ifdef __USE_GNU
|
|
# ifdef __REDIRECT_NTH
|
|
extern int __REDIRECT_NTH (pthread_mutexattr_getrobust_np,
|
|
- (pthread_mutex_t *, int *),
|
|
+ (pthread_mutexattr_t *, int *),
|
|
pthread_mutexattr_getrobust) __nonnull ((1))
|
|
__attribute_deprecated_msg__ ("\
|
|
pthread_mutexattr_getrobust_np is deprecated, use pthread_mutexattr_getrobust");
|
|
@@ -949,7 +949,7 @@ extern int pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr,
|
|
# ifdef __USE_GNU
|
|
# ifdef __REDIRECT_NTH
|
|
extern int __REDIRECT_NTH (pthread_mutexattr_setrobust_np,
|
|
- (pthread_mutex_t *, int),
|
|
+ (pthread_mutexattr_t *, int),
|
|
pthread_mutexattr_setrobust) __nonnull ((1))
|
|
__attribute_deprecated_msg__ ("\
|
|
pthread_mutexattr_setrobust_np is deprecated, use pthread_mutexattr_setrobust");
|