diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:53:29 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:54:41 +0100 |
| commit | 488fb43a499982e99915c78bb70f04357ac37463 (patch) | |
| tree | e356d0f1d327ed3de4a9d5abec1edf346070aa32 /nptl/sysdeps/unix/sysv/linux/x86_64 | |
| parent | eab709096f23a4511adfc547450a83008eae5fb2 (diff) | |
| parent | 20af204581e1ba42738c1bfb69cc2f5350f4ffa4 (diff) | |
Merge branch 'release/2.11/master' into fedora/2.11/master
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/x86_64')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S index 0d48ec6fcd..680696200a 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S @@ -96,8 +96,8 @@ ENTRY(__pthread_disable_asynccancel) cmpxchgl %r11d, %fs:CANCELHANDLING jnz 2b -3: movl %r11d, %eax - andl $(TCB_CANCELING_BITMASK|TCB_CANCELED_BITMASK), %eax + movl %r11d, %eax +3: andl $(TCB_CANCELING_BITMASK|TCB_CANCELED_BITMASK), %eax cmpl $TCB_CANCELING_BITMASK, %eax je 4f 1: ret @@ -111,5 +111,6 @@ ENTRY(__pthread_disable_asynccancel) addq $CANCELHANDLING, %rdi LOAD_PRIVATE_FUTEX_WAIT (%esi) syscall + movl %fs:CANCELHANDLING, %eax jmp 3b END(__pthread_disable_asynccancel) |