---

yaml --- r: 264188 b: refs/heads/master c: f4142cb h: refs/heads/master v: v3
git-mirror · Sep 29, 2011 · 149dd14 · 149dd14
1 parent 24be1fe
commit 149dd14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11032c17bd3f96a4319e4415c07fc791525b79fd
+refs/heads/master: f4142cba4e4065a416e78ade905bea29ff3930e6
diff --git a/trunk/arch/sparc/mm/init_64.c b/trunk/arch/sparc/mm/init_64.c
@@ -511,6 +511,11 @@ static void __init read_obp_translations(void)
 		for (i = 0; i < prom_trans_ents; i++)
 			prom_trans[i].data &= ~0x0003fe0000000000UL;
 	}
+
+	/* Force execute bit on.  */
+	for (i = 0; i < prom_trans_ents; i++)
+		prom_trans[i].data |= (tlb_type == hypervisor ?
+				       _PAGE_EXEC_4V : _PAGE_EXEC_4U);
 }
 
 static void __init hypervisor_tlb_lock(unsigned long vaddr,