svn commit: r205824 - stable/7/sys/dev/hwpmc

[Fabien Thomas]

Author: fabient
Date: Mon Mar 29 06:56:17 2010
New Revision: 205824
URL: http://svn.freebsd.org/changeset/base/205824

Log:
  MFC r205694:
  Handling SIGPIPE will cause deadlock/crash.
  Return an error immediatly in case of hard shutdown.

Modified:
  stable/7/sys/dev/hwpmc/hwpmc_logging.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/hwpmc/hwpmc_logging.c
==============================================================================
--- stable/7/sys/dev/hwpmc/hwpmc_logging.c	Mon Mar 29 06:55:38 2010	(r205823)
+++ stable/7/sys/dev/hwpmc/hwpmc_logging.c	Mon Mar 29 06:56:17 2010	(r205824)
@@ -298,7 +298,6 @@ pmclog_loop(void *arg)
 
 		mtx_unlock(&pmc_kthread_mtx);
 
-sigpipe_retry:
 		/* process the request */
 		PMCDBG(LOG,WRI,2, "po=%p base=%p ptr=%p", po,
 		    lb->plb_base, lb->plb_ptr);
@@ -322,9 +321,6 @@ sigpipe_retry:
 
 		if (error) {
 			/* XXX some errors are recoverable */
-			if (error == EPIPE)
-				goto sigpipe_retry;
-
 			/* send a SIGIO to the owner and exit */
 			PROC_LOCK(p);
 			psignal(p, SIGIO);