[linux-yocto] [PATCH] module: Fix build failure due to cracked commit

zhe.he at windriver.com zhe.he at windriver.com
Mon Aug 26 19:14:02 PDT 2019


From: He Zhe <zhe.he at windriver.com>

This is the missing half of the following commit that is cracked during merging,
which causes build failure.
3b5be16c7e90 ("modules: page-align module section allocations only for arches supporting strict module rwx")

Signed-off-by: He Zhe <zhe.he at windriver.com>
---
This is for every branches of linux-yocto-dev.

 kernel/module.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/module.c b/kernel/module.c
index 92e3c2e..9ee9342 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -69,6 +69,9 @@
  */
 #ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX
 # define debug_align(X) ALIGN(X, PAGE_SIZE)
+#else
+# define debug_align(X) (X)
+#endif
 
 /* If this is set, the section belongs in the init part of the module */
 #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
-- 
2.7.4



More information about the linux-yocto mailing list