diff options
| author | andrew <andrew@FreeBSD.org> | 2016-04-06 14:08:10 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2016-04-06 14:08:10 +0000 |
| commit | d532565c6da2dee9fa355e47534a76d44af6b7b1 (patch) | |
| tree | 0f0897f7901270c88c46efd291b325b718f2b470 /sys/arm64 | |
| parent | b96ba003d03d8772cac516c11358172ed588f28a (diff) | |
| download | FreeBSD-src-d532565c6da2dee9fa355e47534a76d44af6b7b1.zip FreeBSD-src-d532565c6da2dee9fa355e47534a76d44af6b7b1.tar.gz | |
Allow vmparam.h to be included from assembly files on arm64.
Obtained from: ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/arm64')
| -rw-r--r-- | sys/arm64/arm64/copyinout.S | 2 | ||||
| -rw-r--r-- | sys/arm64/arm64/genassym.c | 3 | ||||
| -rw-r--r-- | sys/arm64/arm64/locore.S | 1 | ||||
| -rw-r--r-- | sys/arm64/arm64/support.S | 1 | ||||
| -rw-r--r-- | sys/arm64/include/vmparam.h | 6 |
5 files changed, 9 insertions, 4 deletions
diff --git a/sys/arm64/arm64/copyinout.S b/sys/arm64/arm64/copyinout.S index b99dbc2..86711fc 100644 --- a/sys/arm64/arm64/copyinout.S +++ b/sys/arm64/arm64/copyinout.S @@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$"); #include <sys/errno.h> +#include <machine/vmparam.h> + #include "assym.s" /* diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index 26adc6d..36ad877 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -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); diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 676c1d5..615b2e1 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -34,6 +34,7 @@ #include <machine/hypervisor.h> #include <machine/param.h> #include <machine/pte.h> +#include <machine/vmparam.h> #define VIRT_BITS 48 diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S index 4938240..1ca8c2b 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include <machine/setjmp.h> #include <machine/param.h> +#include <machine/vmparam.h> #include "assym.s" diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index cd9198e..e086422 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -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_ */ |
