svn commit: r218329 - head/sys/i386/i386

[Konstantin Belousov]

Author: kib
Date: Sat Feb  5 15:37:10 2011
New Revision: 218329
URL: http://svn.freebsd.org/changeset/base/218329

Log:
  Fix linking of the kernel without device npx.
  
  MFC after:	2 weeks

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

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Sat Feb  5 15:13:18 2011	(r218328)
+++ head/sys/i386/i386/machdep.c	Sat Feb  5 15:37:10 2011	(r218329)
@@ -3229,7 +3229,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,
@@ -3253,7 +3257,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);
 }