2020-10-26 14:31:38

by Heiko Carstens

Subject: [GIT PULL] s390 compile fix for 5.10-rc2

Hi Linus,

please pull a simple fix, so that s390 compiles again after Joe Perches' commit
33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")")
which went in just before 5.10-rc1.

Thanks,
Heiko

The following changes since commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec:

Linux 5.10-rc1 (2020-10-25 15:14:11 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.10-2

for you to fetch changes up to 8e90b4b1305a80b1d7712370a163eff269ac1ba2:

s390: correct __bootdata / __bootdata_preserved macros (2020-10-26 14:18:01 +0100)

----------------------------------------------------------------
- Fix s390 compile breakage caused by commit 33def8498fdd
("treewide: Convert macro and uses of __section(foo) to __section("foo")")

----------------------------------------------------------------
Vasily Gorbik (1):
s390: correct __bootdata / __bootdata_preserved macros

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;

2020-10-27 01:21:33

by pr-tracker-bot

Subject: Re: [GIT PULL] s390 compile fix for 5.10-rc2

The pull request you sent on Mon, 26 Oct 2020 15:29:56 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.10-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7e2b2da60658ee6cf7a421596a3c9eb619c810f9

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html