---

yaml --- r: 349141 b: refs/heads/master c: 93d5bf0 h: refs/heads/master i: 349139: 98d3a7f v: v3
git-mirror · Jan 19, 2013 · da5cefc · da5cefc
1 parent 263ab66
commit da5cefc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15653371c67c3fbe359ae37b720639dd4c7b42c5
+refs/heads/master: 93d5bf073a1e01035be66dc41860b9ae9aa9ccfa
diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/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,