From owner-svn-src-all@FreeBSD.ORG  Fri Jan 28 19:53:38 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5AC2B1065672;
	Fri, 28 Jan 2011 19:53:38 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4AA588FC24;
	Fri, 28 Jan 2011 19:53:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0SJrcMT097734;
	Fri, 28 Jan 2011 19:53:38 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0SJrcNf097732;
	Fri, 28 Jan 2011 19:53:38 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201101281953.p0SJrcNf097732@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 28 Jan 2011 19:53:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218032 - releng/8.2/sys/i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jan 2011 19:53:38 -0000

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