svn commit: r218849 - stable/8/sys/pc98/pc98

[Takahashi Yoshihiro]

Author: nyan
Date: Sat Feb 19 11:47:48 2011
New Revision: 218849
URL: http://svn.freebsd.org/changeset/base/218849

Log:
  MFC: revision 218391
  
    Fix linking of the kernel without device npx.

Modified:
  stable/8/sys/pc98/pc98/machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/pc98/pc98/machdep.c
==============================================================================
--- stable/8/sys/pc98/pc98/machdep.c	Sat Feb 19 11:44:46 2011	(r218848)
+++ stable/8/sys/pc98/pc98/machdep.c	Sat Feb 19 11:47:48 2011	(r218849)
@@ -2542,7 +2542,11 @@ fill_fpregs(struct thread *td, struct fp
 
 	KASSERT(td == curthread || TD_IS_SUSPENDED(td),
 	    ("not suspended thread %p", td));
+#ifdef DEV_NPX
 	npxgetregs(td);
+#else
+	bzero(fpregs, sizeof(*fpregs));
+#endif
 #ifdef CPU_ENABLE_SSE
 	if (cpu_fxsr)
 		fill_fpregs_xmm(&td->td_pcb->pcb_user_save.sv_xmm,
@@ -2566,7 +2570,9 @@ set_fpregs(struct thread *td, struct fpr
 #endif /* CPU_ENABLE_SSE */
 		bcopy(fpregs, &td->td_pcb->pcb_user_save.sv_87,
 		    sizeof(*fpregs));
+#ifdef DEV_NPX
 	npxuserinited(td);
+#endif
 	return (0);
 }