From owner-svn-src-all@FreeBSD.ORG Sat Nov 28 18:34:35 2009 Return-Path: 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 DF6D91065672; Sat, 28 Nov 2009 18:34:35 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CD8E18FC14; Sat, 28 Nov 2009 18:34:35 +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 nASIYZGk063680; Sat, 28 Nov 2009 18:34:35 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nASIYZPq063677; Sat, 28 Nov 2009 18:34:35 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200911281834.nASIYZPq063677@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 28 Nov 2009 18:34:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199889 - stable/8/sys/powerpc/aim 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Nov 2009 18:34:36 -0000 Author: nwhitehorn Date: Sat Nov 28 18:34:35 2009 New Revision: 199889 URL: http://svn.freebsd.org/changeset/base/199889 Log: MFC r197961,197962: Fix two typos that caused DSISR and CR not to be preserved across context switches. Modified: stable/8/sys/powerpc/aim/swtch.S stable/8/sys/powerpc/aim/trap_subr.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) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/powerpc/aim/swtch.S ============================================================================== --- stable/8/sys/powerpc/aim/swtch.S Sat Nov 28 17:48:25 2009 (r199888) +++ stable/8/sys/powerpc/aim/swtch.S Sat Nov 28 18:34:35 2009 (r199889) @@ -171,7 +171,7 @@ ENTRY(savectx) mr %r12,%r2 stmw %r12,PCB_CONTEXT(%r3) /* Save the non-volatile GP regs */ mfcr %r4 /* Save the condition register */ - stw %r4,PCB_CONTEXT(%r3) + stw %r4,PCB_CR(%r3) blr /* Modified: stable/8/sys/powerpc/aim/trap_subr.S ============================================================================== --- stable/8/sys/powerpc/aim/trap_subr.S Sat Nov 28 17:48:25 2009 (r199888) +++ stable/8/sys/powerpc/aim/trap_subr.S Sat Nov 28 18:34:35 2009 (r199889) @@ -451,7 +451,7 @@ disitrap: lwz %r30,(PC_TEMPSAVE+CPUSAVE_AIM_DAR)(%r1) /* get DAR */ stw %r30,(PC_DBSAVE +CPUSAVE_AIM_DAR)(%r1) /* save DAR */ lwz %r30,(PC_TEMPSAVE+CPUSAVE_AIM_DSISR)(%r1) /* get DSISR */ - lwz %r30,(PC_DBSAVE +CPUSAVE_AIM_DSISR)(%r1) /* save DSISR */ + stw %r30,(PC_DBSAVE +CPUSAVE_AIM_DSISR)(%r1) /* save DSISR */ lwz %r30,(PC_DISISAVE+CPUSAVE_R28)(%r1) /* get r28 */ stw %r30,(PC_DBSAVE +CPUSAVE_R28)(%r1) /* save r28 */ lwz %r31,(PC_DISISAVE+CPUSAVE_R29)(%r1) /* get r29 */