[linux-yocto] [linux-yocto-dev] Merge tag 'v5.3-rc6' into standard/base

[Jun Miao]

Hi Bruce,

    I am sorry to trouble you .

    When you merge tag 'v5.3-rc6' into standard/base, why you delete  
"define debug_align(X) (X)" and lose the "#endif" (#ifend ... #endif)  ?


------------------------------------------------------------------------------

commit b73b90b1d2cc6b4ba740e66479ab054482174f94
Merge: ce4ec6f a55aa89
Author: Bruce Ashfield <bruce.ashfield at gmail.com>
Date:   Sun Aug 25 22:28:04 2019 -0400

     Merge tag 'v5.3-rc6' into standard/base

     Linux 5.3-rc6

     Signed-off-by: Bruce Ashfield <bruce.ashfield at gmail.com>

diff --cc kernel/module.c
index cd8df51,9ee9342..92e3c2e
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -64,9 -64,14 +64,11 @@@

   /*
    * Modules' sections will be aligned on page boundaries
-  * to ensure complete separation of code and data
+  * to ensure complete separation of code and data, but
+  * only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
    */
+ #ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX
   # define debug_align(X) ALIGN(X, PAGE_SIZE)
  -#else
  -# define debug_align(X) (X)
  -#endif


-- 
Thanks
Jun

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/linux-yocto/attachments/20190826/522d8bae/attachment.html>