diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-26 09:36:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-26 09:36:36 +0100 |
| commit | c825dda905bac330c2da7fabdf5c0ac28758b3cd (patch) | |
| tree | 597fe4f90c49f784a0dbf1596c027880747210ec /arch/arm/mm | |
| parent | b0a37dca72a05b7b579f288d8a67afeed96bffa5 (diff) | |
| parent | 8fb54284ba6aa1f0d832ec015fde64ecf4bb0f4f (diff) | |
| download | blackbird-obmc-linux-c825dda905bac330c2da7fabdf5c0ac28758b3cd.tar.gz blackbird-obmc-linux-c825dda905bac330c2da7fabdf5c0ac28758b3cd.zip | |
Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into devel-stable
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/mmu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 594d677b92c8..ea9c9f3e48bf 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -273,6 +273,14 @@ static struct mem_type mem_types[] = { .prot_l1 = PMD_TYPE_TABLE, .domain = DOMAIN_KERNEL, }, + [MT_MEMORY_SO] = { + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | + L_PTE_MT_UNCACHED, + .prot_l1 = PMD_TYPE_TABLE, + .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S | + PMD_SECT_UNCACHED | PMD_SECT_XN, + .domain = DOMAIN_KERNEL, + }, }; const struct mem_type *get_mem_type(unsigned int type) |
