---

yaml --- r: 80501 b: refs/heads/master c: 4c881ca h: refs/heads/master i: 80499: 0f38bd9 v: v3
git-mirror · Jan 30, 2008 · 37d7c31 · 37d7c31
1 parent a643fdb
commit 37d7c31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8192206df093e8fc607b5072ce71a930d44f8638
+refs/heads/master: 4c881ca1819da180b047f87eedeb9a5957918705
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
@@ -130,8 +130,13 @@ static int split_large_page(pte_t *kpte, unsigned long address)
 		set_pte(&pbase[i], pfn_pte(addr >> PAGE_SHIFT, ref_prot));
 
 	/*
-	 * Install the new, split up pagetable:
+	 * Install the new, split up pagetable. Important detail here:
+	 *
+	 * On Intel the NX bit of all levels must be cleared to make a
+	 * page executable. See section 4.13.2 of Intel 64 and IA-32
+	 * Architectures Software Developer's Manual).
 	 */
+	ref_prot = pte_pgprot(pte_mkexec(pte_clrhuge(*kpte)));
 	__set_pmd_pte(kpte, address, mk_pte(base, ref_prot));
 	base = NULL;