Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jan 2011 18:11:37 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r217798 - stable/8/sys/i386/i386
Message-ID:  <201101241811.p0OIBbGm001640@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Mon Jan 24 18:11:37 2011
New Revision: 217798
URL: http://svn.freebsd.org/changeset/base/217798

Log:
  MFC:	r217587
  
  Fix yet another fallout from r208833.  VM86 BIOS call may cause page fault
  when FPU is in use.

Modified:
  stable/8/sys/i386/i386/vm86bios.s
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/vm86bios.s
==============================================================================
--- stable/8/sys/i386/i386/vm86bios.s	Mon Jan 24 18:07:57 2011	(r217797)
+++ stable/8/sys/i386/i386/vm86bios.s	Mon Jan 24 18:11:37 2011	(r217798)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101241811.p0OIBbGm001640>