From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 18 Sep 2019 13:49:52 +0000 (+0200)
Subject: fix build issues in 4.19 patch
X-Git-Tag: v4.14.145~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d5522b08330af4e3479621e566322a6912ca9ae;p=thirdparty%2Fkernel%2Fstable-queue.git

fix build issues in 4.19 patch
---

diff --git a/queue-4.19/modules-fix-compile-error-if-don-t-have-strict-module-rwx.patch b/queue-4.19/modules-fix-compile-error-if-don-t-have-strict-module-rwx.patch
index 1b04ae94cd8..16fe786e52e 100644
--- a/queue-4.19/modules-fix-compile-error-if-don-t-have-strict-module-rwx.patch
+++ b/queue-4.19/modules-fix-compile-error-if-don-t-have-strict-module-rwx.patch
@@ -23,8 +23,8 @@ Signed-off-by: Jessica Yu <jeyu@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- kernel/module.c |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
+ kernel/module.c |   13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
 
 --- a/kernel/module.c
 +++ b/kernel/module.c
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static void frob_rodata(const struct module_layout *layout,
  			int (*set_memory)(unsigned long start, int num_pages))
  {
-@@ -2039,17 +2040,21 @@ static void disable_ro_nx(const struct m
+@@ -2039,17 +2040,23 @@ static void disable_ro_nx(const struct m
  	frob_writable_data(layout, set_memory_x);
  }
  
@@ -63,7 +63,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	frob_text(&mod->init_layout, set_memory_x);
  }
 +#else /* !CONFIG_ARCH_HAS_STRICT_MODULE_RWX */
++static void disable_ro_nx(const struct module_layout *layout) { }
 +static void module_enable_nx(const struct module *mod) { }
++static void module_disable_nx(const struct module *mod) { }
 +static void module_enable_x(const struct module *mod) { }
 +#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */