--- v15
+++ v11
@@ -23,23 +23,23 @@
2 files changed, 35 insertions(+)
diff --git a/arch/powerpc/include/asm/set_memory.h b/arch/powerpc/include/asm/set_memory.h
-index 64011ea444b4..b040094f7920 100644
+index d1cd69b1a43a..a738e86f34bd 100644
--- a/arch/powerpc/include/asm/set_memory.h
+++ b/arch/powerpc/include/asm/set_memory.h
-@@ -29,4 +29,6 @@ static inline int set_memory_x(unsigned long addr, int numpages)
- return change_memory_attr(addr, numpages, SET_MEMORY_X);
- }
+@@ -7,4 +7,6 @@ int set_memory_rw(unsigned long addr, int numpages);
+ int set_memory_nx(unsigned long addr, int numpages);
+ int set_memory_x(unsigned long addr, int numpages);
+int set_memory_attr(unsigned long addr, int numpages, pgprot_t prot);
+
#endif
diff --git a/arch/powerpc/mm/pageattr.c b/arch/powerpc/mm/pageattr.c
-index 5e5ae50a7f23..0876216ceee6 100644
+index 3b4aa72e555e..9098066bc113 100644
--- a/arch/powerpc/mm/pageattr.c
+++ b/arch/powerpc/mm/pageattr.c
-@@ -99,3 +99,36 @@ int change_memory_attr(unsigned long addr, int numpages, long action)
- return apply_to_existing_page_range(&init_mm, start, size,
- change_page_attr, (void *)action);
+@@ -103,3 +103,36 @@ int set_memory_x(unsigned long addr, int numpages)
+ {
+ return change_memory_attr(addr, numpages, pte_mkexec);
}
+
+/*