From owner-svn-src-stable-7@FreeBSD.ORG  Fri Feb  6 12:33:40 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 145A61065677;
	Fri,  6 Feb 2009 12:33:40 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 017F98FC16;
	Fri,  6 Feb 2009 12:33:40 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n16CXdBA061423;
	Fri, 6 Feb 2009 12:33:39 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n16CXd1s061422;
	Fri, 6 Feb 2009 12:33:39 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902061233.n16CXd1s061422@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 6 Feb 2009 12:33:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188230 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2009 12:33:40 -0000

Author: rwatson
Date: Fri Feb  6 12:33:39 2009
New Revision: 188230
URL: http://svn.freebsd.org/changeset/base/188230

Log:
  Merge r187881 from head to stable/7:
  
    If a process is a zombie and we couldn't identify another useful state,
    print out the state as "zombine" in preference to "unknown" when ^T is
    pressed.
  
    Sponsored by: Google, Inc.
  
  (Note that this change appears in tty.c in 7.x vs tty_info.c in 8.x)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/tty.c

Modified: stable/7/sys/kern/tty.c
==============================================================================
--- stable/7/sys/kern/tty.c	Fri Feb  6 12:27:25 2009	(r188229)
+++ stable/7/sys/kern/tty.c	Fri Feb  6 12:33:39 2009	(r188230)
@@ -2608,6 +2608,8 @@ ttyinfo(struct tty *tp)
 		state = "suspended";
 	else if (TD_AWAITING_INTR(td))
 		state = "intrwait";
+	else if (pick->p_state == PRS_ZOMBIE)
+		state = "zombie";
 	else
 		state = "unknown";
 	pctcpu = (sched_pctcpu(td) * 10000 + FSCALE / 2) >> FSHIFT;