summaryrefslogtreecommitdiff
path: root/nptl/pthread_mutexattr_getprioceiling.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-08-15 05:53:50 +0000
committerJakub Jelinek <jakub@redhat.com>2006-08-15 05:53:50 +0000
commit3a2ba84afba2d9b315c65aa46ba036fd22ef4fb0 (patch)
tree47a553a26365a6738426804af7609434daf047b8 /nptl/pthread_mutexattr_getprioceiling.c
parent256926546643ba909661c83e7a7d24d733b9b390 (diff)
Updated to fedora-glibc-20060815T0533
Diffstat (limited to 'nptl/pthread_mutexattr_getprioceiling.c')
-rw-r--r--nptl/pthread_mutexattr_getprioceiling.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/nptl/pthread_mutexattr_getprioceiling.c b/nptl/pthread_mutexattr_getprioceiling.c
index da1beabf46..792e9a43d6 100644
--- a/nptl/pthread_mutexattr_getprioceiling.c
+++ b/nptl/pthread_mutexattr_getprioceiling.c
@@ -27,11 +27,22 @@ pthread_mutexattr_getprioceiling (attr, prioceiling)
int *prioceiling;
{
const struct pthread_mutexattr *iattr;
+ int ceiling;
iattr = (const struct pthread_mutexattr *) attr;
- *prioceiling = ((iattr->mutexkind & PTHREAD_MUTEXATTR_PRIO_CEILING_MASK)
- >> PTHREAD_MUTEXATTR_PRIO_CEILING_SHIFT);
+ ceiling = ((iattr->mutexkind & PTHREAD_MUTEXATTR_PRIO_CEILING_MASK)
+ >> PTHREAD_MUTEXATTR_PRIO_CEILING_SHIFT);
+
+ if (! ceiling)
+ {
+ if (__sched_fifo_min_prio == -1)
+ __init_sched_fifo_prio ();
+ if (ceiling < __sched_fifo_min_prio)
+ ceiling = __sched_fifo_min_prio;
+ }
+
+ *prioceiling = ceiling;
return 0;
}