Skip to content

Commit

Permalink
Merge tag 's390-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Oct 26, 2020
2 parents 3650b22 + 8e90b4b commit 7e2b2da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/s390/include/asm/sections.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7e2b2da

Please sign in to comment.