diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2013-01-17 07:18:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 11:41:25 +0000 |
| commit | 93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (patch) | |
| tree | fd0700579339f3ccd388e00396a5c2fa86a1733e /arch/arm/mm | |
| parent | 15653371c67c3fbe359ae37b720639dd4c7b42c5 (diff) | |
| download | linux-stable-93d5bf073a1e01035be66dc41860b9ae9aa9ccfa.tar.gz linux-stable-93d5bf073a1e01035be66dc41860b9ae9aa9ccfa.tar.bz2 linux-stable-93d5bf073a1e01035be66dc41860b9ae9aa9ccfa.zip | |
ARM: 7629/1: mm: Fix missing XN flag for for MT_MEMORY_SO
Commit 8fb54284ba6a {ARM: mm: Add strongly ordered descriptor support}
added XN flag at section level but missed it at PTE level.
Fix it by adding the L_PTE_XN to MT_MEMORY_SO PTE descriptor.
Reported-by: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 9f0610243bd6..ce328c7f5c94 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -283,7 +283,7 @@ static struct mem_type mem_types[] = { }, [MT_MEMORY_SO] = { .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | - L_PTE_MT_UNCACHED, + L_PTE_MT_UNCACHED | L_PTE_XN, .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S | PMD_SECT_UNCACHED | PMD_SECT_XN, |