From owner-svn-src-stable@FreeBSD.ORG  Thu May 22 05:20:21 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E2901BDF;
 Thu, 22 May 2014 05:20:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CFDBA26AE;
 Thu, 22 May 2014 05:20:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4M5KLhW029374;
 Thu, 22 May 2014 05:20:21 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4M5KLR1029372;
 Thu, 22 May 2014 05:20:21 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201405220520.s4M5KLR1029372@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Thu, 22 May 2014 05:20:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r266532 - stable/10/sys/powerpc/aim
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 May 2014 05:20:22 -0000

Author: jhibbits
Date: Thu May 22 05:20:21 2014
New Revision: 266532
URL: http://svnweb.freebsd.org/changeset/base/266532

Log:
  MFC r266116,r266136
  
  A page mask size is 12-bits, not 11.

Modified:
  stable/10/sys/powerpc/aim/trap_subr32.S
  stable/10/sys/powerpc/aim/trap_subr64.S
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/powerpc/aim/trap_subr32.S
==============================================================================
--- stable/10/sys/powerpc/aim/trap_subr32.S	Thu May 22 05:04:40 2014	(r266531)
+++ stable/10/sys/powerpc/aim/trap_subr32.S	Thu May 22 05:20:21 2014	(r266532)
@@ -677,7 +677,7 @@ disitrap:
 	mtcr	%r31
 	bt	17,realtrap		/* branch is user mode */
 	mfsprg1	%r31			/* get old SP */
-	clrrwi	%r31,%r31,11		/* Round SP down to nearest page */
+	clrrwi	%r31,%r31,12		/* Round SP down to nearest page */
 	sub.	%r30,%r31,%r30		/* SP - DAR */
 	bge	1f
 	neg	%r30,%r30		/* modulo value */

Modified: stable/10/sys/powerpc/aim/trap_subr64.S
==============================================================================
--- stable/10/sys/powerpc/aim/trap_subr64.S	Thu May 22 05:04:40 2014	(r266531)
+++ stable/10/sys/powerpc/aim/trap_subr64.S	Thu May 22 05:20:21 2014	(r266532)
@@ -585,7 +585,7 @@ disitrap:
 	mtcr	%r31
 	bt	17,realtrap		/* branch is user mode */
 	mfsprg1	%r31			/* get old SP */
-	clrrdi	%r31,%r31,11		/* Round SP down to nearest page */
+	clrrdi	%r31,%r31,12		/* Round SP down to nearest page */
 	sub.	%r30,%r31,%r30		/* SP - DAR */
 	bge	1f
 	neg	%r30,%r30		/* modulo value */