Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 2 Mar 2011 06:09:52 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r219164 - in stable/8/sys: amd64/linux32 i386/linux
Message-ID:  <201103020609.p2269q2Y082705@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dchagin
Date: Wed Mar  2 06:09:52 2011
New Revision: 219164
URL: http://svn.freebsd.org/changeset/base/219164

Log:
  MFC r218100:
  The kern_wait() code already removes the SIGCHLD signal for the waited
  process. Removing other SIGCHLD signals is not needed and may cause
  problems.

Modified:
  stable/8/sys/amd64/linux32/linux32_machdep.c
  stable/8/sys/i386/linux/linux_machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- stable/8/sys/amd64/linux32/linux32_machdep.c	Wed Mar  2 06:08:42 2011	(r219163)
+++ stable/8/sys/amd64/linux32/linux32_machdep.c	Wed Mar  2 06:09:52 2011	(r219164)
@@ -1279,7 +1279,6 @@ linux_wait4(struct thread *td, struct li
 	int error, options;
 	struct rusage ru, *rup;
 	struct l_rusage lru;
-	struct proc *p;
 
 #ifdef DEBUG
 	if (ldebug(wait4))
@@ -1300,12 +1299,6 @@ linux_wait4(struct thread *td, struct li
 	error = linux_common_wait(td, args->pid, args->status, options, rup);
 	if (error)
 		return (error);
-
-	p = td->td_proc;
-	PROC_LOCK(p);
-	sigqueue_delete(&p->p_sigqueue, SIGCHLD);
-	PROC_UNLOCK(p);
-
 	if (args->rusage != NULL) {
 		bsd_to_linux_rusage(rup, &lru);
 		error = copyout(&lru, args->rusage, sizeof(lru));

Modified: stable/8/sys/i386/linux/linux_machdep.c
==============================================================================
--- stable/8/sys/i386/linux/linux_machdep.c	Wed Mar  2 06:08:42 2011	(r219163)
+++ stable/8/sys/i386/linux/linux_machdep.c	Wed Mar  2 06:09:52 2011	(r219164)
@@ -1318,7 +1318,6 @@ linux_wait4(struct thread *td, struct li
 {
 	int error, options;
 	struct rusage ru, *rup;
-	struct proc *p;
 
 #ifdef DEBUG
 	if (ldebug(wait4))
@@ -1339,12 +1338,6 @@ linux_wait4(struct thread *td, struct li
 	error = linux_common_wait(td, args->pid, args->status, options, rup);
 	if (error)
 		return (error);
-
-	p = td->td_proc;
-	PROC_LOCK(p);
-	sigqueue_delete(&p->p_sigqueue, SIGCHLD);
-	PROC_UNLOCK(p);
-
 	if (args->rusage != NULL)
 		error = copyout(&ru, args->rusage, sizeof(ru));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103020609.p2269q2Y082705>