~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to debian/patches/amd64/local-pthread_cond_wait.diff

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
2012-02-08  Jeff Law  <law@redhat.com>
2
 
 
3
 
        * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: fix lost
4
 
          wakeups.
5
 
 
6
 
---
7
 
 nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S |    3 +++
8
 
 1 file changed, 3 insertions(+)
9
 
 
10
 
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
11
 
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
12
 
@@ -365,6 +365,9 @@
13
 
        incl    cond_futex(%rdi)
14
 
        movl    cond_futex(%rdi), %edx
15
 
 
16
 
+       /* Increment total_seq to ensure we do not lose wakeups.  */
17
 
+       incq    total_seq(%rdi)
18
 
+
19
 
        /* Release internal lock.  */
20
 
        LOCK
21
 
 #if cond_lock == 0