summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-generic/pgtable.h4
-rw-r--r--mm/nommu.c4
-rw-r--r--mm/vmalloc.c4
3 files changed, 4 insertions, 8 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 62bbd6f23c35..88ebc6102c7c 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -1109,6 +1109,10 @@ static inline bool arch_has_pfn_modify_check(void)
1109# define PAGE_KERNEL_RO PAGE_KERNEL 1109# define PAGE_KERNEL_RO PAGE_KERNEL
1110#endif 1110#endif
1111 1111
1112#ifndef PAGE_KERNEL_EXEC
1113# define PAGE_KERNEL_EXEC PAGE_KERNEL
1114#endif
1115
1112#endif /* !__ASSEMBLY__ */ 1116#endif /* !__ASSEMBLY__ */
1113 1117
1114#ifndef io_remap_pfn_range 1118#ifndef io_remap_pfn_range
diff --git a/mm/nommu.c b/mm/nommu.c
index 9fc9e43335b6..e4aac33216ae 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -364,10 +364,6 @@ void *vzalloc_node(unsigned long size, int node)
364} 364}
365EXPORT_SYMBOL(vzalloc_node); 365EXPORT_SYMBOL(vzalloc_node);
366 366
367#ifndef PAGE_KERNEL_EXEC
368# define PAGE_KERNEL_EXEC PAGE_KERNEL
369#endif
370
371/** 367/**
372 * vmalloc_exec - allocate virtually contiguous, executable memory 368 * vmalloc_exec - allocate virtually contiguous, executable memory
373 * @size: allocation size 369 * @size: allocation size
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index cfea25be7754..a728fc492557 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1907,10 +1907,6 @@ void *vzalloc_node(unsigned long size, int node)
1907} 1907}
1908EXPORT_SYMBOL(vzalloc_node); 1908EXPORT_SYMBOL(vzalloc_node);
1909 1909
1910#ifndef PAGE_KERNEL_EXEC
1911# define PAGE_KERNEL_EXEC PAGE_KERNEL
1912#endif
1913
1914/** 1910/**
1915 * vmalloc_exec - allocate virtually contiguous, executable memory 1911 * vmalloc_exec - allocate virtually contiguous, executable memory
1916 * @size: allocation size 1912 * @size: allocation size