about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-07-11 14:16:01 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-07-11 14:16:01 -0300
commitbde2a94b61d1cef444d7d4b4b9db70062c48cf5d (patch)
tree5393a8c666de2fb8995df1282909c09ed17d9351 /sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S
parent3f1ff80d9a0c60398e73d62c52f9a2f06af8d61d (diff)
parent66986dec455c2011085a04b72a5bd55d9f9c7d1c (diff)
downloadglibc-bde2a94b61d1cef444d7d4b4b9db70062c48cf5d.tar.gz
glibc-bde2a94b61d1cef444d7d4b4b9db70062c48cf5d.tar.xz
glibc-bde2a94b61d1cef444d7d4b4b9db70062c48cf5d.zip
Merge branch 'release/2.19/master' into ibm/2.19/master ibm/2.19/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.S2
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 42839e26f1..b26377398a 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