From 706f20574b7cc94754c9b3ccf7d986ed78f41c89 Mon Sep 17 00:00:00 2001
From: "Huang, Ying" <ying.huang@intel.com>
Date: Wed, 17 Oct 2007 18:04:35 +0200
Subject: [PATCH] --- yaml --- r: 70962 b: refs/heads/master c:
 84e0fdb1754d066dd0a8b257de7299f392d1e727 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/mm/pageattr_64.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aa185da0ce62..8aaa11dee06c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87cde760abfa019b5e368186f893cf673d227632
+refs/heads/master: 84e0fdb1754d066dd0a8b257de7299f392d1e727
diff --git a/trunk/arch/x86/mm/pageattr_64.c b/trunk/arch/x86/mm/pageattr_64.c
index 10b9809ce821..93d795d7c2ae 100644
--- a/trunk/arch/x86/mm/pageattr_64.c
+++ b/trunk/arch/x86/mm/pageattr_64.c
@@ -148,6 +148,7 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
 			split = split_large_page(address, prot, ref_prot2);
 			if (!split)
 				return -ENOMEM;
+			pgprot_val(ref_prot2) &= ~_PAGE_NX;
 			set_pte(kpte, mk_pte(split, ref_prot2));
 			kpte_page = split;
 		}