diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:20:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:20:02 +0200 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/mm/mmu.c | |
| parent | Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl... (diff) | |
| parent | ARM: 6246/1: mmci: support larger MMCIDATALENGTH register (diff) | |
| download | linux-ceb0885d3b01bb2e2f18765770e212914f2864be.tar.xz linux-ceb0885d3b01bb2e2f18765770e212914f2864be.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index d5541adc3520..6e1c4f6a2b3f 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -257,6 +257,19 @@ static struct mem_type mem_types[] = { .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, .domain = DOMAIN_KERNEL, }, + [MT_MEMORY_DTCM] = { + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | + L_PTE_DIRTY | L_PTE_WRITE, + .prot_l1 = PMD_TYPE_TABLE, + .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, + .domain = DOMAIN_KERNEL, + }, + [MT_MEMORY_ITCM] = { + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | + L_PTE_USER | L_PTE_EXEC, + .prot_l1 = PMD_TYPE_TABLE, + .domain = DOMAIN_IO, + }, }; const struct mem_type *get_mem_type(unsigned int type) |