svn commit: r218032 - releng/8.2/sys/i386/i386

[Jung-uk Kim]

Author: jkim
Date: Fri Jan 28 19:53:38 2011
New Revision: 218032
URL: http://svn.freebsd.org/changeset/base/218032

Log:
  MFC:	r217587
  
  Fix yet another fallout from r208833.  VM86 BIOS call may cause page fault
  when FPU is in use.
  
  Approved by:	re (kib)

Modified:
  releng/8.2/sys/i386/i386/vm86bios.s
Directory Properties:
  releng/8.2/sys/   (props changed)
  releng/8.2/sys/amd64/include/xen/   (props changed)
  releng/8.2/sys/cddl/contrib/opensolaris/   (props changed)
  releng/8.2/sys/contrib/dev/acpica/   (props changed)
  releng/8.2/sys/contrib/pf/   (props changed)

Modified: releng/8.2/sys/i386/i386/vm86bios.s
==============================================================================
--- releng/8.2/sys/i386/i386/vm86bios.s	Fri Jan 28 19:04:15 2011	(r218031)
+++ releng/8.2/sys/i386/i386/vm86bios.s	Fri Jan 28 19:53:38 2011	(r218032)
@@ -73,10 +73,9 @@ ENTRY(vm86_bioscall)
 	je 	1f			/* no curproc/npxproc */
 	pushl	%edx
 	movl	TD_PCB(%ecx),%ecx
-	addl	$PCB_SAVEFPU,%ecx
-	pushl	%ecx
+	pushl	PCB_SAVEFPU(%ecx)
 	call	npxsave
-	popl	%ecx
+	addl	$4,%esp
 	popl	%edx			/* recover our pcb */
 1:
 	popfl