diff options
| author | skra <skra@FreeBSD.org> | 2016-02-17 14:39:29 +0000 |
|---|---|---|
| committer | skra <skra@FreeBSD.org> | 2016-02-17 14:39:29 +0000 |
| commit | a8f5ecad19b5c936057dbbcda2353b9ca84b09f5 (patch) | |
| tree | f73f29db4a4baccc0998d90257f26b728f0ceb0b /sys/arm | |
| parent | 5a75ca85eabc0f951be312de095a115e512e4d06 (diff) | |
| download | FreeBSD-src-a8f5ecad19b5c936057dbbcda2353b9ca84b09f5.zip FreeBSD-src-a8f5ecad19b5c936057dbbcda2353b9ca84b09f5.tar.gz | |
Do not use PMAP_DOMAIN_KERNEL definition for __ARM_ARCH >= 6 as domains
are not utilized there. Only domain #0 is used and there is no reference
to it in the whole pmap-v6.c. Thus initialize domain access register in
locore-v6.c without reference too.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/genassym.c | 2 | ||||
| -rw-r--r-- | sys/arm/arm/locore-v6.S | 2 | ||||
| -rw-r--r-- | sys/arm/include/pmap-v6.h | 26 |
3 files changed, 3 insertions, 27 deletions
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c index 4149771..7b742bf 100644 --- a/sys/arm/arm/genassym.c +++ b/sys/arm/arm/genassym.c @@ -129,7 +129,9 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); #endif ASSYM(PAGE_SIZE, PAGE_SIZE); +#if __ARM_ARCH < 6 ASSYM(PMAP_DOMAIN_KERNEL, PMAP_DOMAIN_KERNEL); +#endif #ifdef PMAP_INCLUDE_PTE_SYNC ASSYM(PMAP_INCLUDE_PTE_SYNC, 1); #endif diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S index b93af2c..959dcc6 100644 --- a/sys/arm/arm/locore-v6.S +++ b/sys/arm/arm/locore-v6.S @@ -280,7 +280,7 @@ ASENTRY_NP(init_mmu) mcr CP15_CONTEXTIDR(r0) /* Set ASID to 0 */ /* Set the Domain Access register */ - mov r0, #((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT) + mov r0, #DOMAIN_CLIENT /* Only domain #0 is used */ mcr CP15_DACR(r0) /* diff --git a/sys/arm/include/pmap-v6.h b/sys/arm/include/pmap-v6.h index bb38356..87da59a 100644 --- a/sys/arm/include/pmap-v6.h +++ b/sys/arm/include/pmap-v6.h @@ -220,30 +220,4 @@ void pmap_preboot_map_attr(vm_paddr_t, vm_offset_t, vm_size_t, vm_prot_t, vm_memattr_t); #endif /* _KERNEL */ - -// ----------------- TO BE DELETED --------------------------------------------- -#ifdef _KERNEL - -/* - * sys/arm/arm/elf_trampoline.c - * sys/arm/arm/genassym.c - * sys/arm/arm/machdep.c - * sys/arm/arm/mp_machdep.c - * sys/arm/arm/locore.S - * sys/arm/arm/pmap.c - * sys/arm/arm/swtch.S - * sys/arm/at91/at91_machdep.c - * sys/arm/cavium/cns11xx/econa_machdep.c - * sys/arm/s3c2xx0/s3c24x0_machdep.c - * sys/arm/xscale/ixp425/avila_machdep.c - * sys/arm/xscale/i8134x/crb_machdep.c - * sys/arm/xscale/i80321/ep80219_machdep.c - * sys/arm/xscale/i80321/iq31244_machdep.c - * sys/arm/xscale/pxa/pxa_machdep.c - */ -#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ - -#endif /* _KERNEL */ -// ----------------------------------------------------------------------------- - #endif /* !_MACHINE_PMAP_H_ */ |
