svn commit: r229186 - in stable/9/sys: amd64/amd64 i386/i386

[Konstantin Belousov]

Author: kib
Date: Sun Jan  1 18:54:29 2012
New Revision: 229186
URL: http://svn.freebsd.org/changeset/base/229186

Log:
  MFC r227394:
  Stopped process may legitimately have some threads sleeping and not
  suspended, if the sleep is uninterruptible.
  
  MFC r227442:
  Weaken the part of assertions added in the r227394. Only check that the
  process state is stopped.

Modified:
  stable/9/sys/amd64/amd64/machdep.c
  stable/9/sys/i386/i386/machdep.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/9/sys/amd64/amd64/machdep.c	Sun Jan  1 18:45:59 2012	(r229185)
+++ stable/9/sys/amd64/amd64/machdep.c	Sun Jan  1 18:54:29 2012	(r229186)
@@ -2018,7 +2018,8 @@ int
 fill_fpregs(struct thread *td, struct fpreg *fpregs)
 {
 
-	KASSERT(td == curthread || TD_IS_SUSPENDED(td),
+	KASSERT(td == curthread || TD_IS_SUSPENDED(td) ||
+	    P_SHOULDSTOP(td->td_proc),
 	    ("not suspended thread %p", td));
 	fpugetregs(td);
 	fill_fpregs_xmm(&td->td_pcb->pcb_user_save, fpregs);

Modified: stable/9/sys/i386/i386/machdep.c
==============================================================================
--- stable/9/sys/i386/i386/machdep.c	Sun Jan  1 18:45:59 2012	(r229185)
+++ stable/9/sys/i386/i386/machdep.c	Sun Jan  1 18:54:29 2012	(r229186)
@@ -3270,7 +3270,8 @@ int
 fill_fpregs(struct thread *td, struct fpreg *fpregs)
 {
 
-	KASSERT(td == curthread || TD_IS_SUSPENDED(td),
+	KASSERT(td == curthread || TD_IS_SUSPENDED(td) ||
+	    P_SHOULDSTOP(td->td_proc),
 	    ("not suspended thread %p", td));
 #ifdef DEV_NPX
 	npxgetregs(td);