diff options
Diffstat (limited to 'sys/alpha/osf1/osf1_signal.c')
| -rw-r--r-- | sys/alpha/osf1/osf1_signal.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/sys/alpha/osf1/osf1_signal.c b/sys/alpha/osf1/osf1_signal.c index f275195..355cb1c 100644 --- a/sys/alpha/osf1/osf1_signal.c +++ b/sys/alpha/osf1/osf1_signal.c @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/param.h> -#include <sys/lock.h> -#include <sys/mutex.h> #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/signalvar.h> @@ -147,12 +145,9 @@ osf1_to_bsd_sigaction(osa, bsa) { bsa->sa_handler = osa->osa_handler; - if (osf1_sigdbg) { - mtx_lock(&Giant); + if (osf1_sigdbg) uprintf("%s(%d): handler @0x%lx \n", __FILE__, __LINE__, (unsigned long)osa->osa_handler); - mtx_unlock(&Giant); - } osf1_to_bsd_sigset(&osa->osa_mask, &bsa->sa_mask); bsa->sa_flags = 0; if ((osa->osa_flags & OSF1_SA_ONSTACK) != 0) @@ -230,12 +225,9 @@ osf1_sigaction(td, uap) struct sigaction *nbsap; int error; - if (osf1_sigdbg && uap->sigtramp) { - mtx_lock(&Giant); + if (osf1_sigdbg && uap->sigtramp) uprintf("osf1_sigaction: trampoline handler at %p\n", uap->sigtramp); - mtx_unlock(&Giant); - } td->td_md.osf_sigtramp = uap->sigtramp; if (uap->nsa != NULL) { if ((error = copyin(uap->nsa, &osa, sizeof(osa))) != 0) @@ -323,10 +315,8 @@ osf1_signal(td, uap) #endif error = kern_sigaction(td, signum, &nbsa, &obsa, 0); if (error != 0) { - mtx_lock(&Giant); DPRINTF("signal: sigaction failed: %d\n", error); - mtx_unlock(&Giant); td->td_retval[0] = -1; return (error); } @@ -362,11 +352,8 @@ osf1_signal(td, uap) SIGEMPTYSET(sa.sa_mask); sa.sa_flags = 0; error = kern_sigaction(td, signum, &sa, NULL, 0); - if (error != 0) { - mtx_lock(&Giant); + if (error != 0) DPRINTF(("sigignore: sigaction failed\n")); - mtx_unlock(&Giant); - } return (error); } @@ -557,11 +544,8 @@ osf1_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) /* * Set up the registers to return to sigcode. */ - if (osf1_sigdbg) { - mtx_lock(&Giant); + if (osf1_sigdbg) uprintf("attempting to call osf1 sigtramp\n"); - mtx_unlock(&Giant); - } frame->tf_regs[FRAME_PC] = (u_int64_t)td->td_md.osf_sigtramp; frame->tf_regs[FRAME_A0] = sig; frame->tf_regs[FRAME_A1] = code; @@ -643,9 +627,7 @@ osf1_osigstack(td, uap) } */ *uap; { -/* mtx_lock(&Giant); - uprintf("osf1_osigstack: oss = %p, nss = %p",uap->oss, uap->nss); - uprintf(" stack ptr = %p\n",p->p_sigacts->ps_sigstk.ss_sp); - mtx_unlock(&Giant); */ +/* uprintf("osf1_osigstack: oss = %p, nss = %p",uap->oss, uap->nss); + uprintf(" stack ptr = %p\n",p->p_sigacts->ps_sigstk.ss_sp);*/ return(osigstack(td, (struct osigstack_args *)uap)); } |
