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

[Andrew Turner]

Author: andrew
Date: Mon May  5 10:36:18 2014
New Revision: 265353
URL: http://svnweb.freebsd.org/changeset/base/265353

Log:
   * Add PHYS_AVAIL_SIZE to size the phys_avail array
   * Set thread0 ad the current thread on boot

Modified:
  projects/arm64/sys/arm64/arm64/machdep.c
  projects/arm64/sys/arm64/include/pmap.h

Modified: projects/arm64/sys/arm64/arm64/machdep.c
==============================================================================
--- projects/arm64/sys/arm64/arm64/machdep.c	Mon May  5 10:29:26 2014	(r265352)
+++ projects/arm64/sys/arm64/arm64/machdep.c	Mon May  5 10:36:18 2014	(r265353)
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 struct pcpu __pcpu[MAXCPU];
 struct pcpu *pcpup = &__pcpu[0];
 
-vm_paddr_t phys_avail[10];
+vm_paddr_t phys_avail[PHYS_AVAIL_SIZE];
 
 int cold = 1;
 long realmem = 0;
@@ -478,7 +478,10 @@ initarm(struct arm64_bootparams *abp)
 	}
 	printf("Total = %llx\n", mem_len);
 
+	/* Set the pcpu data, this is needed by pmap_bootstrap */
+	set_curthread(&thread0);
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));
+	PCPU_SET(curthread, &thread0);
 
 	/* Bootstrap enough of pmap  to enter the kernel proper */
 	pmap_bootstrap(abp->kern_l1pt, KERNBASE - abp->kern_delta,

Modified: projects/arm64/sys/arm64/include/pmap.h
==============================================================================
--- projects/arm64/sys/arm64/include/pmap.h	Mon May  5 10:29:26 2014	(r265352)
+++ projects/arm64/sys/arm64/include/pmap.h	Mon May  5 10:36:18 2014	(r265353)
@@ -106,6 +106,7 @@ extern struct pmap	kernel_pmap_store;
 #define	PMAP_TRYLOCK(pmap)	mtx_trylock(&(pmap)->pm_mtx)
 #define	PMAP_UNLOCK(pmap)	mtx_unlock(&(pmap)->pm_mtx)
 
+#define	PHYS_AVAIL_SIZE	10
 extern vm_paddr_t phys_avail[];
 extern vm_paddr_t dump_avail[];
 extern vm_offset_t virtual_avail;