From owner-svn-src-projects@FreeBSD.ORG Mon May 5 10:36:19 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A3EC36E; Mon, 5 May 2014 10:36:19 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 889BC1A01; Mon, 5 May 2014 10:36:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s45AaJ1v023059; Mon, 5 May 2014 10:36:19 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s45AaJrW023057; Mon, 5 May 2014 10:36:19 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201405051036.s45AaJrW023057@svn.freebsd.org> From: Andrew Turner Date: Mon, 5 May 2014 10:36:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265353 - in projects/arm64/sys/arm64: arm64 include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2014 10:36:19 -0000 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;