svn commit: r259227 - stable/10/sys/powerpc/pseries

[Andreas Tobler]

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;
 	}