No need to review this. Not sure why it didn't include the subject of the merge request, but 5.10-rc1 does not build on s390 without this patch. I expect it will be picked up upstream soon, just did an MR so it is tagged in release and I don't have to manually apply every day until it is pulled. I do not intend to merge this.
On Mon, Oct 26, 2020 at 4:37 PM GitLab Bridge on behalf of jmflinuxtx <[email protected]> wrote: > > From: Vasily Gorbik <[email protected]> > > Currently s390 build is broken. > > SECTCMP .boot.data > error: section .boot.data differs between vmlinux and > arch/s390/boot/compressed/vmlinux > make[2]: *** [arch/s390/boot/section_cmp.boot.data] Error 1 > SECTCMP .boot.preserved.data > error: section .boot.preserved.data differs between vmlinux and > arch/s390/boot/compressed/vmlinux > make[2]: *** [arch/s390/boot/section_cmp.boot.preserved.data] Error 1 > make[1]: *** [bzImage] Error 2 > > Commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo) > to __section("foo")") converted all __section(foo) to __section("foo"). > This is wrong for __bootdata / __bootdata_preserved macros which want > variable names to be a part of intermediate section names .boot.data.<var > name> and .boot.preserved.data.<var name>. Those sections are later > sorted by alignment + name and merged together into final .boot.data > / .boot.preserved.data sections. Those sections must be identical in > the decompressor and the decompressed kernel (that is checked during > the build). > > Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to > __section("foo")") > Signed-off-by: Vasily Gorbik <[email protected]> > Signed-off-by: Heiko Carstens <[email protected]> > --- > arch/s390/include/asm/sections.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/s390/include/asm/sections.h > b/arch/s390/include/asm/sections.h > index a996d3990a02..0c2151451ba5 100644 > --- a/arch/s390/include/asm/sections.h > +++ b/arch/s390/include/asm/sections.h > @@ -26,14 +26,14 @@ static inline int arch_is_kernel_initmem_freed(unsigned > long addr) > * final .boot.data section, which should be identical in the decompressor > and > * the decompressed kernel (that is checked during the build). > */ > -#define __bootdata(var) __section(".boot.data.var") var > +#define __bootdata(var) __section(".boot.data." #var) var > > /* > * .boot.preserved.data is similar to .boot.data, but it is not part of the > * .init section and thus will be preserved for later use in the decompressed > * kernel. > */ > -#define __bootdata_preserved(var) __section(".boot.preserved.data.var") var > +#define __bootdata_preserved(var) __section(".boot.preserved.data." #var) var > > extern unsigned long __sdma, __edma; > extern unsigned long __stext_dma, __etext_dma; > -- > GitLab > _______________________________________________ > kernel mailing list -- [email protected] > To unsubscribe send an email to [email protected] > Fedora Code of Conduct: > https://docs.fedoraproject.org/en-US/project/code-of-conduct/ > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines > List Archives: > https://lists.fedoraproject.org/archives/list/[email protected] _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected]
