svn commit: r242868 - head/sys/pc98/pc98

[Takahashi Yoshihiro]

Author: nyan
Date: Sat Nov 10 13:41:25 2012
New Revision: 242868
URL: http://svnweb.freebsd.org/changeset/base/242868

Log:
  Fix some KASSERTs.
  They are missing changes from r208833, r227394 and r227442.

Modified:
  head/sys/pc98/pc98/machdep.c

Modified: head/sys/pc98/pc98/machdep.c
==============================================================================
--- head/sys/pc98/pc98/machdep.c	Sat Nov 10 13:25:46 2012	(r242867)
+++ head/sys/pc98/pc98/machdep.c	Sat Nov 10 13:41:25 2012	(r242868)
@@ -2652,7 +2652,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);
@@ -2821,6 +2822,7 @@ static void
 fpstate_drop(struct thread *td)
 {
 
+	KASSERT(PCB_USER_FPU(td->td_pcb), ("fpstate_drop: kernel-owned fpu"));
 	critical_enter();
 #ifdef DEV_NPX
 	if (PCPU_GET(fpcurthread) == td)