about summary refs log tree commit diff
path: root/sysdeps/htl
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-04-19 00:09:58 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-04-19 00:09:58 +0200
commitc15f10ee78c6fa837732bb0b3d6cec44e4171fcd (patch)
tree866f1bd8fb5b0736fbbfa9cf4c09ef3f20e2a3e7 /sysdeps/htl
parent3dc0814cba86180c3ad478c81166220fb3e87ea5 (diff)
downloadglibc-c15f10ee78c6fa837732bb0b3d6cec44e4171fcd.tar.gz
glibc-c15f10ee78c6fa837732bb0b3d6cec44e4171fcd.tar.xz
glibc-c15f10ee78c6fa837732bb0b3d6cec44e4171fcd.zip
Revert "Fix sched_param"
This reverts commit 783c4820303fb6b031d401564f8089ecaf154b62 which
accidentaly flew out.
Diffstat (limited to 'sysdeps/htl')
-rw-r--r--sysdeps/htl/bits/types/struct___pthread_attr.h4
-rw-r--r--sysdeps/htl/pt-attr.c2
-rw-r--r--sysdeps/htl/timer_routines.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/htl/bits/types/struct___pthread_attr.h b/sysdeps/htl/bits/types/struct___pthread_attr.h
index 5c4b4e6c30..2299c0179f 100644
--- a/sysdeps/htl/bits/types/struct___pthread_attr.h
+++ b/sysdeps/htl/bits/types/struct___pthread_attr.h
@@ -19,7 +19,7 @@
 #ifndef _BITS_TYPES_STRUCT___PTHREAD_ATTR
 #define _BITS_TYPES_STRUCT___PTHREAD_ATTR	1
 
-#include <bits/types/struct___sched_param.h>
+#include <sched.h>
 
 #define __need_size_t
 #include <stddef.h>
@@ -32,7 +32,7 @@ enum __pthread_contentionscope;
    that not all of them are supported on all systems.  */
 struct __pthread_attr
 {
-  struct __sched_param __schedparam;
+  struct sched_param __schedparam;
   void *__stackaddr;
   size_t __stacksize;
   size_t __guardsize;
diff --git a/sysdeps/htl/pt-attr.c b/sysdeps/htl/pt-attr.c
index fc39aa63d6..77ecc73465 100644
--- a/sysdeps/htl/pt-attr.c
+++ b/sysdeps/htl/pt-attr.c
@@ -24,7 +24,7 @@
 #include <pt-internal.h>
 
 const struct __pthread_attr __pthread_default_attr = {
-  __schedparam: { __sched_priority: 0 },
+  __schedparam: { sched_priority: 0 },
   __stacksize: 0,
   __stackaddr: NULL,
 #ifdef PAGESIZE
diff --git a/sysdeps/htl/timer_routines.h b/sysdeps/htl/timer_routines.h
index 062128cf92..a8134f510f 100644
--- a/sysdeps/htl/timer_routines.h
+++ b/sysdeps/htl/timer_routines.h
@@ -32,8 +32,8 @@ thread_attr_compare (const pthread_attr_t * left, const pthread_attr_t * right)
   struct __pthread_attr *ileft = (struct __pthread_attr *) left;
   struct __pthread_attr *iright = (struct __pthread_attr *) right;
 
-  return ileft->__schedparam.__sched_priority
-	   == iright->__schedparam.__sched_priority
+  return ileft->__schedparam.sched_priority
+	   == iright->__schedparam.sched_priority
 	 && ileft->__stackaddr == iright->__stackaddr
 	 && ileft->__stacksize == iright->__stacksize
 	 && ileft->__guardsize == iright->__guardsize