From owner-svn-src-stable@FreeBSD.ORG  Wed Dec 11 20:56:24 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1DBFE9C5;
 Wed, 11 Dec 2013 20:56:24 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 098E116E6;
 Wed, 11 Dec 2013 20:56:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBBKuNr6047468;
 Wed, 11 Dec 2013 20:56:23 GMT
 (envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBBKuNJo047467;
 Wed, 11 Dec 2013 20:56:23 GMT
 (envelope-from andreast@svn.freebsd.org)
Message-Id: <201312112056.rBBKuNJo047467@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Wed, 11 Dec 2013 20:56:23 +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: r259227 - stable/10/sys/powerpc/pseries
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.17
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: Wed, 11 Dec 2013 20:56:24 -0000

Author: andreast
Date: Wed Dec 11 20:56:23 2013
New Revision: 259227
URL: http://svnweb.freebsd.org/changeset/base/259227

Log:
  MFC	r258503
  
  Limit the large page size to 16MB for now.

Modified:
  stable/10/sys/powerpc/pseries/mmu_phyp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/powerpc/pseries/mmu_phyp.c
==============================================================================
--- stable/10/sys/powerpc/pseries/mmu_phyp.c	Wed Dec 11 19:30:27 2013	(r259226)
+++ stable/10/sys/powerpc/pseries/mmu_phyp.c	Wed Dec 11 20:56:23 2013	(r259227)
@@ -165,6 +165,11 @@ mphyp_bootstrap(mmu_t mmup, vm_offset_t 
 				nptlp--;
 			}
 		}
+
+		/* For now we allow shift only to be <= 0x18. */
+		if (shift >= 0x18)
+		    shift = 0x18;
+
 		moea64_large_page_shift = shift;
 		moea64_large_page_size = 1 << shift;
 	}