svn commit: r265761 - in projects/arm64/sys/arm64: arm64 include

Andrew Turner andrew at FreeBSD.org
Fri May 9 09:02:30 UTC 2014


Author: andrew
Date: Fri May  9 09:02:29 2014
New Revision: 265761
URL: http://svnweb.freebsd.org/changeset/base/265761

Log:
  Pass a stack of KSTACK_PAGES pages into initarm

Modified:
  projects/arm64/sys/arm64/arm64/locore.S
  projects/arm64/sys/arm64/include/machdep.h

Modified: projects/arm64/sys/arm64/arm64/locore.S
==============================================================================
--- projects/arm64/sys/arm64/arm64/locore.S	Fri May  9 08:59:54 2014	(r265760)
+++ projects/arm64/sys/arm64/arm64/locore.S	Fri May  9 09:02:29 2014	(r265761)
@@ -81,8 +81,8 @@ _start:
 
 virtdone:
 	/* Set up the stack */
-	adr	x15, initstack
-	mov	sp, x15
+	adr	x25, initstack
+	mov	sp, x25
 
 	/* Zero the BSS */
 	ldr	x15, .Lbss
@@ -109,6 +109,7 @@ virtdone:
 	str	x1,  [x0]	/* modulep */
 	str	x26, [x0, 8]	/* kern_l1pt */
 	str	x29, [x0, 16]	/* kern_delta */
+	str	x25, [x0, 24]	/* kern_stack */
 
 	/* Branch to C code */
 	bl	initarm
@@ -459,4 +460,4 @@ pagetable:
 	.space	(PAGE_SIZE * 3) /* 3 tables */
 
 initstack:
-	.space	(PAGE_SIZE * 4)
+	.space	(PAGE_SIZE * KSTACK_PAGES)

Modified: projects/arm64/sys/arm64/include/machdep.h
==============================================================================
--- projects/arm64/sys/arm64/include/machdep.h	Fri May  9 08:59:54 2014	(r265760)
+++ projects/arm64/sys/arm64/include/machdep.h	Fri May  9 09:02:29 2014	(r265761)
@@ -33,6 +33,7 @@ struct arm64_bootparams {
 	vm_offset_t	modulep;
 	vm_offset_t	kern_l1pt;	/* L1 page table for the kernel */
 	uint64_t	kern_delta;
+	vm_offset_t	kern_stack;
 };
 
 extern vm_paddr_t physmap[];


More information about the svn-src-projects mailing list