Skip to content

Commit 8e90b4b

Browse files
Vasily Gorbikhcahca
authored andcommitted
s390: correct __bootdata / __bootdata_preserved macros
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 33def84 ("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: 33def84 ("treewide: Convert macro and uses of __section(foo) to __section("foo")") Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 3650b22 commit 8e90b4b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/s390/include/asm/sections.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ static inline int arch_is_kernel_initmem_freed(unsigned long addr)
2626
* final .boot.data section, which should be identical in the decompressor and
2727
* the decompressed kernel (that is checked during the build).
2828
*/
29-
#define __bootdata(var) __section(".boot.data.var") var
29+
#define __bootdata(var) __section(".boot.data." #var) var
3030

3131
/*
3232
* .boot.preserved.data is similar to .boot.data, but it is not part of the
3333
* .init section and thus will be preserved for later use in the decompressed
3434
* kernel.
3535
*/
36-
#define __bootdata_preserved(var) __section(".boot.preserved.data.var") var
36+
#define __bootdata_preserved(var) __section(".boot.preserved.data." #var) var
3737

3838
extern unsigned long __sdma, __edma;
3939
extern unsigned long __stext_dma, __etext_dma;

0 commit comments

Comments
 (0)