From owner-svn-src-all@freebsd.org Wed Apr 6 14:08:12 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AEC9B05B30; Wed, 6 Apr 2016 14:08:12 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C10521711; Wed, 6 Apr 2016 14:08:11 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u36E8Ahw058692; Wed, 6 Apr 2016 14:08:10 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u36E8Aks058687; Wed, 6 Apr 2016 14:08:10 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201604061408.u36E8Aks058687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 6 Apr 2016 14:08:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297615 - in head/sys/arm64: arm64 include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2016 14:08:12 -0000 Author: andrew Date: Wed Apr 6 14:08:10 2016 New Revision: 297615 URL: https://svnweb.freebsd.org/changeset/base/297615 Log: Allow vmparam.h to be included from assembly files on arm64. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Modified: head/sys/arm64/arm64/copyinout.S head/sys/arm64/arm64/genassym.c head/sys/arm64/arm64/locore.S head/sys/arm64/arm64/support.S head/sys/arm64/include/vmparam.h Modified: head/sys/arm64/arm64/copyinout.S ============================================================================== --- head/sys/arm64/arm64/copyinout.S Wed Apr 6 12:48:45 2016 (r297614) +++ head/sys/arm64/arm64/copyinout.S Wed Apr 6 14:08:10 2016 (r297615) @@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$"); #include +#include + #include "assym.s" /* Modified: head/sys/arm64/arm64/genassym.c ============================================================================== --- head/sys/arm64/arm64/genassym.c Wed Apr 6 12:48:45 2016 (r297614) +++ head/sys/arm64/arm64/genassym.c Wed Apr 6 14:08:10 2016 (r297615) @@ -37,9 +37,6 @@ __FBSDID("$FreeBSD$"); #include #include -ASSYM(KERNBASE, KERNBASE); -ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); - ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); Modified: head/sys/arm64/arm64/locore.S ============================================================================== --- head/sys/arm64/arm64/locore.S Wed Apr 6 12:48:45 2016 (r297614) +++ head/sys/arm64/arm64/locore.S Wed Apr 6 14:08:10 2016 (r297615) @@ -34,6 +34,7 @@ #include #include #include +#include #define VIRT_BITS 48 Modified: head/sys/arm64/arm64/support.S ============================================================================== --- head/sys/arm64/arm64/support.S Wed Apr 6 12:48:45 2016 (r297614) +++ head/sys/arm64/arm64/support.S Wed Apr 6 14:08:10 2016 (r297615) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include "assym.s" Modified: head/sys/arm64/include/vmparam.h ============================================================================== --- head/sys/arm64/include/vmparam.h Wed Apr 6 12:48:45 2016 (r297614) +++ head/sys/arm64/include/vmparam.h Wed Apr 6 14:08:10 2016 (r297615) @@ -160,7 +160,6 @@ #define DMAP_MIN_ADDRESS (0xffffffc000000000UL) #define DMAP_MAX_ADDRESS (0xffffffdfffffffffUL) -extern vm_paddr_t dmap_phys_base; #define DMAP_MIN_PHYSADDR (dmap_phys_base) #define DMAP_MAX_PHYSADDR (dmap_phys_base + (DMAP_MAX_ADDRESS - DMAP_MIN_ADDRESS)) @@ -229,10 +228,15 @@ extern vm_paddr_t dmap_phys_base; #define UMA_MD_SMALL_ALLOC +#ifndef LOCORE + +extern vm_paddr_t dmap_phys_base; extern u_int tsb_kernel_ldd_phys; extern vm_offset_t vm_max_kernel_address; extern vm_offset_t init_pt_va; +#endif + #define ZERO_REGION_SIZE (64 * 1024) /* 64KB */ #endif /* !_MACHINE_VMPARAM_H_ */