svn commit: r218837 - stable/8/sys/i386/i386
Konstantin Belousov
kib at FreeBSD.org
Sat Feb 19 07:45:17 UTC 2011
Author: kib
Date: Sat Feb 19 07:45:17 2011
New Revision: 218837
URL: http://svn.freebsd.org/changeset/base/218837
Log:
MFC r218329:
Fix kernel linkage without device npx.
Modified:
stable/8/sys/i386/i386/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/i386/i386/machdep.c
==============================================================================
--- stable/8/sys/i386/i386/machdep.c Sat Feb 19 07:39:14 2011 (r218836)
+++ stable/8/sys/i386/i386/machdep.c Sat Feb 19 07:45:17 2011 (r218837)
@@ -3211,7 +3211,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,
@@ -3235,7 +3239,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);
}
More information about the svn-src-stable-8
mailing list