svn commit: r188230 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern

[Robert Watson]

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;