Skip to contentSkip to conversation

x86: check __supported_pte_mask in set_memory_x/nx

PATCH In review Huang, Ying 1 participant 1 message Feb 1, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 x86: check __supported_pte_mask in set_memory_x/nx

This patch adds __supported_pte_mask checking to set_memory_x/nx.

---
 arch/x86/mm/pageattr.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
arch/x86/mm/pageattr.c +10 -2
@@ -445,13 +445,21 @@ EXPORT_SYMBOL(set_memory_wb);
 
 int set_memory_x(unsigned long addr, int numpages)
 {
-	return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_NX));
+	if (__supported_pte_mask & _PAGE_NX)
+		return change_page_attr_clear(addr, numpages,
+					      __pgprot(_PAGE_NX));
+	else
+		return 0;
 }
 EXPORT_SYMBOL(set_memory_x);
 
 int set_memory_nx(unsigned long addr, int numpages)
 {
-	return change_page_attr_set(addr, numpages, __pgprot(_PAGE_NX));
+	if (__supported_pte_mask & _PAGE_NX)
+		return change_page_attr_set(addr, numpages,
+					    __pgprot(_PAGE_NX));
+	else
+		return 0;
 }
 EXPORT_SYMBOL(set_memory_nx);