oops. Sorry about that, I forgot to push the resolution I did earlier today for this. It should be in the tree now.
Bruce On Mon, Aug 26, 2019 at 10:14 PM <zhe...@windriver.com> wrote: > > From: He Zhe <zhe...@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...@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 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto