diff options
| author | skra <skra@FreeBSD.org> | 2016-02-03 12:11:07 +0000 |
|---|---|---|
| committer | skra <skra@FreeBSD.org> | 2016-02-03 12:11:07 +0000 |
| commit | 8fba5119d8c590b526917c91f673b02f4e5d6062 (patch) | |
| tree | 396a1e9874d50ade9435c1ba4552687258ddbb3b | |
| parent | 9b1e69366637d18110038c26a3509bea536ae11a (diff) | |
| download | FreeBSD-src-8fba5119d8c590b526917c91f673b02f4e5d6062.zip FreeBSD-src-8fba5119d8c590b526917c91f673b02f4e5d6062.tar.gz | |
Partly revert r295168 and define PTE_DEVICE in pmap-v6.h header again.
It turned out that devmap.c is not only file in which PTE_DEVICE
is used and simultaneously, built for both armv4 and armv6 platforms.
When I tried to build all arm kernels before r295168 commit, it was
hid by some other local changes in my tree. I hope that this is just
temporary workaround before VM_MEMATTR_DEVICE could be used instead of
PTE_DEVICE outside of pmap code for __ARM_ARCH < 6.
| -rw-r--r-- | sys/arm/arm/devmap.c | 3 | ||||
| -rw-r--r-- | sys/arm/include/pmap-v6.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/arm/arm/devmap.c b/sys/arm/arm/devmap.c index 4dffa8c..011b579 100644 --- a/sys/arm/arm/devmap.c +++ b/sys/arm/arm/devmap.c @@ -55,9 +55,6 @@ static boolean_t devmap_bootstrap_done = false; #define PTE_DEVICE VM_MEMATTR_DEVICE #elif defined(__arm__) #define MAX_VADDR ARM_VECTORS_HIGH -#if __ARM_ARCH >= 6 -#define PTE_DEVICE VM_MEMATTR_DEVICE -#endif #endif /* diff --git a/sys/arm/include/pmap-v6.h b/sys/arm/include/pmap-v6.h index d522384..b380c29 100644 --- a/sys/arm/include/pmap-v6.h +++ b/sys/arm/include/pmap-v6.h @@ -250,6 +250,8 @@ void pmap_preboot_map_attr(vm_paddr_t, vm_offset_t, vm_size_t, vm_prot_t, */ void vector_page_setprot(int); +#define PTE_DEVICE VM_MEMATTR_DEVICE + #endif /* _KERNEL */ // ----------------------------------------------------------------------------- |
