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 <sys/errno.h>
+#include <machine/vmparam.h>
+
#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 <machine/pcb.h>
#include <machine/vmparam.h>
-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 <machine/hypervisor.h>
#include <machine/param.h>
#include <machine/pte.h>
+#include <machine/vmparam.h>
#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 <machine/setjmp.h>
#include <machine/param.h>
+#include <machine/vmparam.h>
#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_ */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
