svn commit: r333636 - head/sys/arm64/arm64

[Andrew Turner]

Author: andrew
Date: Tue May 15 16:44:35 2018
New Revision: 333636
URL: https://svnweb.freebsd.org/changeset/base/333636

Log:
  Increase the number of pages we allocate in the arm64 early boot. We are
  already close to the limit so increasing the kernel size may cause it to
  fail to boot when it runs past the end of allocated memory.
  
  Reported by:	manu
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm64/arm64/locore.S

Modified: head/sys/arm64/arm64/locore.S
==============================================================================
--- head/sys/arm64/arm64/locore.S	Tue May 15 16:24:58 2018	(r333635)
+++ head/sys/arm64/arm64/locore.S	Tue May 15 16:44:35 2018	(r333636)
@@ -354,8 +354,8 @@ create_pagetables:
 	mov	x6, #(KERNBASE)
 	/* Find modulep - begin */
 	sub	x8, x0, x6
-	/* Add a 2MiB page for the module data and round up */
-	ldr	x7, =(2 * L2_SIZE - 1)
+	/* Add two 2MiB pages for the module data and round up */
+	ldr	x7, =(3 * L2_SIZE - 1)
 	add	x8, x8, x7
 	/* Get the number of l2 pages to allocate, rounded down */
 	lsr	x10, x8, #(L2_SHIFT)