diff options
author | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
---|---|---|
committer | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
commit | 2feb372c585eb77141adbff24d4958e5a5e6678a (patch) | |
tree | 79416b255a6e61e6fdbc913da3be86d87a8a25ff /sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S | |
parent | c69c361ca6bf95f8c665884ee863168a321d472a (diff) | |
parent | 916ef0f69613613e11123657bff127bd26104630 (diff) | |
download | glibc-ibm/2.20/master.zip glibc-ibm/2.20/master.tar.gz glibc-ibm/2.20/master.tar.bz2 |
Merge release/2.20/master into ibm/2.20/masteribm/2.20/master
Conflicts:
NEWS
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S')
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S b/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S index 42839e2..b263773 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S @@ -34,7 +34,7 @@ ENTRY(__setcontext) lr %r1,%r2 /* rt_sigprocmask (SIG_SETMASK, &sc->sc_mask, NULL, sigsetsize). */ - la %r2,SIG_BLOCK + la %r2,SIG_SETMASK la %r3,SC_MASK(%r1) slr %r4,%r4 lhi %r5,_NSIG8 |