d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partly revert r295168 and define PTE_DEVICE in pmap-v6.h header again.

Browse Source 
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.
This commit is contained in:
Svatopluk Kraus 2016-02-03 12:11:07 +00:00
parent e4b59b10f8
commit b4ae00fcd7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arm/arm/devmap.c
View File

@ -55,9 +55,6 @@ static boolean_t devmap_bootstrap_done = false;
#define PTE_DEVICE VM_MEMATTR_DEVICE #define PTE_DEVICE VM_MEMATTR_DEVICE
#elif defined(__arm__) #elif defined(__arm__)
#define MAX_VADDR ARM_VECTORS_HIGH #define MAX_VADDR ARM_VECTORS_HIGH
#if __ARM_ARCH >= 6
#define PTE_DEVICE VM_MEMATTR_DEVICE
#endif
#endif #endif
/* /*

2
sys/arm/include/pmap-v6.h
View File

@ -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); void vector_page_setprot(int);
#define PTE_DEVICE VM_MEMATTR_DEVICE
#endif /* _KERNEL */ #endif /* _KERNEL */
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------