about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-08-30 07:33:02 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-08-30 07:33:02 +0200
commit9743c6272df3d4f4c37cc98e68fab83bf3f57efb (patch)
treef1d6be2c8ce9caa13cbd03b72d2a7ddaa3ad989b /nptl
parenta644a4b2139c7f2a79392431fc8e3413f0e1da04 (diff)
downloadglibc-9743c6272df3d4f4c37cc98e68fab83bf3f57efb.tar.gz
glibc-9743c6272df3d4f4c37cc98e68fab83bf3f57efb.tar.xz
glibc-9743c6272df3d4f4c37cc98e68fab83bf3f57efb.zip
nptl: Move pthread_attr_getinheritsched implementation into libc
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile3
-rw-r--r--nptl/Versions2
-rw-r--r--nptl/forward.c2
-rw-r--r--nptl/nptl-init.c1
4 files changed, 2 insertions, 6 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 823241d3a0..47ec88b5cf 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -32,7 +32,7 @@ routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
 	   register-atfork pthread_atfork pthread_self thrd_current \
 	   thrd_equal thrd_sleep thrd_yield pthread_equal \
 	   pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate \
-	   pthread_attr_setdetachstate
+	   pthread_attr_setdetachstate pthread_attr_getinheritsched
 shared-only-routines = forward
 static-only-routines = pthread_atfork
 
@@ -58,7 +58,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_attr_getguardsize pthread_attr_setguardsize \
 		      pthread_attr_getschedparam pthread_attr_setschedparam \
 		      pthread_attr_getschedpolicy pthread_attr_setschedpolicy \
-		      pthread_attr_getinheritsched \
 		      pthread_attr_setinheritsched \
 		      pthread_attr_getscope pthread_attr_setscope \
 		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
diff --git a/nptl/Versions b/nptl/Versions
index 1e055eaabe..6f4d74ffda 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -51,7 +51,7 @@ libpthread {
 
     pthread_attr_getschedparam; pthread_attr_setschedparam;
     pthread_attr_getschedpolicy; pthread_attr_setschedpolicy;
-    pthread_attr_getinheritsched; pthread_attr_setinheritsched;
+    pthread_attr_setinheritsched;
     pthread_attr_getscope; pthread_attr_setscope;
 
     pthread_mutex_init; pthread_mutex_destroy;
diff --git a/nptl/forward.c b/nptl/forward.c
index 163a3e5d5b..95e477ff37 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -56,8 +56,6 @@ name decl								      \
   FORWARD2 (name, int, decl, params, return defretval)
 
 
-FORWARD (pthread_attr_getinheritsched,
-	 (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0)
 FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
 	 (attr, inherit), 0)
 
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 4594cf53ea..80fa46fb5c 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -72,7 +72,6 @@ void __nptl_set_robust (struct pthread *);
 #ifdef SHARED
 static const struct pthread_functions pthread_functions =
   {
-    .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
     .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched,
     .ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam,
     .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,