Merged from sys/i386/i386/machdep.c revision 1.479.

This commit is contained in:
KATO Takenori 2001-09-12 08:15:24 +00:00
parent f1422f2ebc
commit d92580b608
2 changed files with 8 additions and 10 deletions

View File

@ -307,7 +307,7 @@ osendsig(catcher, sig, mask, code)
int oonstack;
p = curproc;
PROC_LOCK(p);
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
regs = p->p_frame;
oonstack = sigonstack(regs->tf_esp);
@ -341,7 +341,6 @@ osendsig(catcher, sig, mask, code)
SIGDELSET(p->p_sigcatch, SIGILL);
SIGDELSET(p->p_sigmask, SIGILL);
psignal(p, SIGILL);
PROC_UNLOCK(p);
return;
}
@ -435,6 +434,7 @@ osendsig(catcher, sig, mask, code)
regs->tf_fs = _udatasel;
load_gs(_udatasel);
regs->tf_ss = _udatasel;
PROC_LOCK(p);
}
#endif
@ -453,11 +453,10 @@ sendsig(catcher, sig, mask, code)
int oonstack;
p = curproc;
PROC_LOCK(p);
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
#ifdef COMPAT_43
if (SIGISMEMBER(psp->ps_osigset, sig)) {
PROC_UNLOCK(p);
osendsig(catcher, sig, mask, code);
return;
}
@ -507,7 +506,6 @@ sendsig(catcher, sig, mask, code)
SIGDELSET(p->p_sigcatch, SIGILL);
SIGDELSET(p->p_sigmask, SIGILL);
psignal(p, SIGILL);
PROC_UNLOCK(p);
return;
}
@ -587,6 +585,7 @@ sendsig(catcher, sig, mask, code)
regs->tf_es = _udatasel;
regs->tf_fs = _udatasel;
regs->tf_ss = _udatasel;
PROC_LOCK(p);
}
/*

View File

@ -307,7 +307,7 @@ osendsig(catcher, sig, mask, code)
int oonstack;
p = curproc;
PROC_LOCK(p);
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
regs = p->p_frame;
oonstack = sigonstack(regs->tf_esp);
@ -341,7 +341,6 @@ osendsig(catcher, sig, mask, code)
SIGDELSET(p->p_sigcatch, SIGILL);
SIGDELSET(p->p_sigmask, SIGILL);
psignal(p, SIGILL);
PROC_UNLOCK(p);
return;
}
@ -435,6 +434,7 @@ osendsig(catcher, sig, mask, code)
regs->tf_fs = _udatasel;
load_gs(_udatasel);
regs->tf_ss = _udatasel;
PROC_LOCK(p);
}
#endif
@ -453,11 +453,10 @@ sendsig(catcher, sig, mask, code)
int oonstack;
p = curproc;
PROC_LOCK(p);
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
#ifdef COMPAT_43
if (SIGISMEMBER(psp->ps_osigset, sig)) {
PROC_UNLOCK(p);
osendsig(catcher, sig, mask, code);
return;
}
@ -507,7 +506,6 @@ sendsig(catcher, sig, mask, code)
SIGDELSET(p->p_sigcatch, SIGILL);
SIGDELSET(p->p_sigmask, SIGILL);
psignal(p, SIGILL);
PROC_UNLOCK(p);
return;
}
@ -587,6 +585,7 @@ sendsig(catcher, sig, mask, code)
regs->tf_es = _udatasel;
regs->tf_fs = _udatasel;
regs->tf_ss = _udatasel;
PROC_LOCK(p);
}
/*