From 12dd99d14afddac34af65340aa8b878706c79b9c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 4 Feb 2008 16:47:55 +0100
Subject: [PATCH] --- yaml --- r: 82842 b: refs/heads/master c:
 b50516fc20f756cf4d18a89f6f9977d60151ccba h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/mm/pageattr.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c1296c6e2c0d..02537a81f9a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cf31841762954ad2868156ccba94d798a16630f
+refs/heads/master: b50516fc20f756cf4d18a89f6f9977d60151ccba
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index e297bd65e513..877b5cca2cb8 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -225,7 +225,6 @@ static int split_large_page(pte_t *kpte, unsigned long address)
 	paravirt_alloc_pt(&init_mm, page_to_pfn(base));
 #endif
 
-	pgprot_val(ref_prot) &= ~_PAGE_NX;
 	for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE)
 		set_pte(&pbase[i], pfn_pte(addr >> PAGE_SHIFT, ref_prot));