Skip to content

Commit 7e2b2da

Browse files
committed
Merge tag 's390-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fix from Heiko Carstens: "Fix s390 compile breakage caused by commit 33def84 ("treewide: Convert macro and uses of __section(foo) to __section("foo")")" * tag 's390-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: correct __bootdata / __bootdata_preserved macros
2 parents 3650b22 + 8e90b4b commit 7e2b2da

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)