aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Andrianov <vitalya@ti.com>2012-05-15 15:01:16 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-05-17 14:48:56 +0100
commit1a3abcf41f13666d4ed241c8cc7f48bd38e7b543 (patch)
tree4d1cb4bc3b0e65149a1ab2d1ad4a51a4bdd2035c
parent9b61a4d1b2064dbd0c9e61754305ac852170509f (diff)
downloadlinux-stericsson-1a3abcf41f13666d4ed241c8cc7f48bd38e7b543.tar.gz
ARM: 7418/1: LPAE: fix access flag setup in mem_type_table
A zero value for prot_sect in the memory types table implies that section mappings should never be created for the memory type in question. This is checked for in alloc_init_section(). With LPAE, we set a bit to mask access flag faults for kernel mappings. This breaks the aforementioned (!prot_sect) check in alloc_init_section(). This patch fixes this bug by first checking for a non-zero prot_sect before setting the PMD_SECT_AF flag. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/mmu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 2c7cf2f9c837..aa78de8bfdd3 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -489,7 +489,8 @@ static void __init build_mem_type_table(void)
*/
for (i = 0; i < ARRAY_SIZE(mem_types); i++) {
mem_types[i].prot_pte |= PTE_EXT_AF;
- mem_types[i].prot_sect |= PMD_SECT_AF;
+ if (mem_types[i].prot_sect)
+ mem_types[i].prot_sect |= PMD_SECT_AF;
}
kern_pgprot |= PTE_EXT_AF;
vecs_pgprot |= PTE_EXT_AF;