aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/pthread
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-21 19:49:50 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-21 19:49:50 +0200
commitf03b78fae46905a5676c7b7f360cadba2f290708 (patch)
tree322292da3aeeb1b8e5504afaf089d8a486228303 /sysdeps/pthread
parent2208066603a136f95cfb815ca9281262e6465784 (diff)
downloadglibc-f03b78fae46905a5676c7b7f360cadba2f290708.tar.xz
glibc-f03b78fae46905a5676c7b7f360cadba2f290708.zip
nptl: Move pthread_mutex_consistent into libc
And deprecated pthread_mutex_consistent_np, its old name. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/pthread')
-rw-r--r--sysdeps/pthread/tst-robust1.c4
-rw-r--r--sysdeps/pthread/tst-robust8.c2
-rw-r--r--sysdeps/pthread/tst-robust9.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/pthread/tst-robust1.c b/sysdeps/pthread/tst-robust1.c
index d4b1d88a68..6342fcbbf7 100644
--- a/sysdeps/pthread/tst-robust1.c
+++ b/sysdeps/pthread/tst-robust1.c
@@ -241,14 +241,14 @@ do_test (void)
#endif
#ifndef NOT_CONSISTENT
- e = pthread_mutex_consistent_np (&m1);
+ e = pthread_mutex_consistent (&m1);
if (e != 0)
{
printf ("%ld: mutex_consistent m1 failed with error %d\n", round, e);
return 1;
}
- e = pthread_mutex_consistent_np (&m2);
+ e = pthread_mutex_consistent (&m2);
if (e != 0)
{
printf ("%ld: mutex_consistent m2 failed with error %d\n", round, e);
diff --git a/sysdeps/pthread/tst-robust8.c b/sysdeps/pthread/tst-robust8.c
index 27dd53d2c3..8f135cb516 100644
--- a/sysdeps/pthread/tst-robust8.c
+++ b/sysdeps/pthread/tst-robust8.c
@@ -92,7 +92,7 @@ mutex_timedlock of %d in thread %ld failed with %d\n",
}
if (e == EOWNERDEAD)
- pthread_mutex_consistent_np (&map[r]);
+ pthread_mutex_consistent (&map[r]);
if (e == 0 || e == EOWNERDEAD)
state[r] = 1;
diff --git a/sysdeps/pthread/tst-robust9.c b/sysdeps/pthread/tst-robust9.c
index befc14f2d8..532aebc4e9 100644
--- a/sysdeps/pthread/tst-robust9.c
+++ b/sysdeps/pthread/tst-robust9.c
@@ -14,10 +14,10 @@ tf (void *data)
int err = pthread_mutex_lock (&m);
if (err == EOWNERDEAD)
{
- err = pthread_mutex_consistent_np (&m);
+ err = pthread_mutex_consistent (&m);
if (err)
{
- puts ("pthread_mutex_consistent_np");
+ puts ("pthread_mutex_consistent");
exit (1);
}
}