diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-09-10 10:33:54 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-12-12 08:15:35 +0100 |
commit | f93e4506937afafa325bd530de3fc39c7399963a (patch) | |
tree | c2d5b6a24769e649c4c9a6e8d5e0ac30cb2d5f9b /patches/glibc-2.18/0002-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pth.patch | |
parent | fc513961e38f5307df71d171b084aba171ff462e (diff) | |
download | OSELAS.Toolchain-f93e4506937afafa325bd530de3fc39c7399963a.tar.gz OSELAS.Toolchain-f93e4506937afafa325bd530de3fc39c7399963a.tar.xz |
glibc: update patches 2.18 -> 2.20
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/glibc-2.18/0002-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pth.patch')
-rw-r--r-- | patches/glibc-2.18/0002-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pth.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/patches/glibc-2.18/0002-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pth.patch b/patches/glibc-2.18/0002-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pth.patch deleted file mode 100644 index a255632..0000000 --- a/patches/glibc-2.18/0002-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pth.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Siddhesh Poyarekar <siddhesh@redhat.com> -Date: Thu, 3 Oct 2013 08:26:21 +0530 -Subject: [PATCH] Fix PI mutex check in pthread_cond_broadcast and - pthread_cond_signal - -Fixes BZ #15996. - -The check had a typo - it checked for PTHREAD_MUTEX_ROBUST_NP instead -of PTHREAD_MUTEX_ROBUST_NORMAL_NP. It has now been replaced by the -already existing convenience macro USE_REQUEUE_PI. ---- - nptl/pthread_cond_broadcast.c | 5 +---- - nptl/pthread_cond_signal.c | 7 +------ - 2 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c -index 0702ec0..7ba9efa 100644 ---- a/nptl/pthread_cond_broadcast.c -+++ b/nptl/pthread_cond_broadcast.c -@@ -63,10 +63,7 @@ __pthread_cond_broadcast (cond) - - #if (defined lll_futex_cmp_requeue_pi \ - && defined __ASSUME_REQUEUE_PI) -- int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP; -- pi_flag &= mut->__data.__kind; -- -- if (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP) -+ if (USE_REQUEUE_PI (mut)) - { - if (lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, INT_MAX, - &mut->__data.__lock, futex_val, -diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c -index 102d0b3..ffc35dc 100644 ---- a/nptl/pthread_cond_signal.c -+++ b/nptl/pthread_cond_signal.c -@@ -49,14 +49,9 @@ __pthread_cond_signal (cond) - - #if (defined lll_futex_cmp_requeue_pi \ - && defined __ASSUME_REQUEUE_PI) -- int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP; - pthread_mutex_t *mut = cond->__data.__mutex; - -- /* Do not use requeue for pshared condvars. */ -- if (mut != (void *) ~0l) -- pi_flag &= mut->__data.__kind; -- -- if (__builtin_expect (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP, 0) -+ if (USE_REQUEUE_PI (mut) - /* This can only really fail with a ENOSYS, since nobody can modify - futex while we have the cond_lock. */ - && lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, 0, |