diff options
| author | Juli Mallett <jmallett@FreeBSD.org> | 2002-10-01 17:15:53 +0000 |
|---|---|---|
| committer | Juli Mallett <jmallett@FreeBSD.org> | 2002-10-01 17:15:53 +0000 |
| commit | 1d9c56964d81bb47d6c0787d316f09984b064b5b (patch) | |
| tree | 07d2fcfbfe85d84af8cf79f8fec57733afa19e18 /sys/compat/linux | |
| parent | 689cd8eeb891bcc4bf05d3fec0bdcbf28d236b45 (diff) | |
Notes
Diffstat (limited to 'sys/compat/linux')
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 3 | ||||
| -rw-r--r-- | sys/compat/linux/linux_signal.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index d344548de97b8..16c8677e0f446 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -36,7 +36,6 @@ #include <sys/imgact_aout.h> #include <sys/jail.h> #include <sys/kernel.h> -#include <sys/ksiginfo.h> #include <sys/lock.h> #include <sys/mac.h> #include <sys/malloc.h> @@ -833,7 +832,7 @@ linux_wait4(struct thread *td, struct linux_wait4_args *args) if ((error = wait4(td, &tmp)) != 0) return error; - signal_delete(td->td_proc, NULL, SIGCHLD); + SIGDELSET(td->td_proc->p_siglist, SIGCHLD); if (args->status) { if ((error = copyin((caddr_t)args->status, &tmpstat, diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index d264db56cf85c..532fb81a678a7 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -34,7 +34,6 @@ #include <sys/mutex.h> #include <sys/proc.h> #include <sys/signalvar.h> -#include <sys/ksiginfo.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> @@ -391,7 +390,7 @@ linux_sigpending(struct thread *td, struct linux_sigpending_args *args) #endif PROC_LOCK(p); - ksiginfo_to_sigset_t(p, &bset); + bset = p->p_siglist; SIGSETAND(bset, p->p_sigmask); bsd_to_linux_sigset(&bset, &lset); PROC_UNLOCK(p); |