From ab9a3c905ae0ce0b72165106bccb827974bc4092 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 28 Dec 2018 21:05:06 +0100 Subject: fix merge --- sysdeps/mach/hurd/i386/sigreturn.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/i386/sigreturn.c b/sysdeps/mach/hurd/i386/sigreturn.c index 126d2f9fc4..9a61854c9a 100644 --- a/sysdeps/mach/hurd/i386/sigreturn.c +++ b/sysdeps/mach/hurd/i386/sigreturn.c @@ -97,13 +97,7 @@ __sigreturn (struct sigcontext *scp) } if (scp->sc_onstack) - { - ss->sigaltstack.ss_flags &= ~SS_ONSTACK; - /* XXX cannot unlock until off sigstack */ - abort (); - } - else - __spin_unlock (&ss->lock); + ss->sigaltstack.ss_flags &= ~SS_ONSTACK; /* Destroy the MiG reply port used by the signal handler, and restore the reply port in use by the thread when interrupted. */ -- cgit v1.2.3