diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
| commit | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (patch) | |
| tree | f12706b80194f48aad3a1bd70ae9215d48875591 /arch/arm/mm/mmu.c | |
| parent | 516fb7a22a5347dc6db731369c365ed1f9b64632 (diff) | |
| parent | c533f32e1ac440b8840159f89ece8c9cca2422b5 (diff) | |
| download | lwn-67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40.tar.gz lwn-67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40.zip | |
Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc
A few device tree updates and an include file fix for versatile.
* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
+ update to 3.4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 3 |
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; |