summaryrefslogtreecommitdiffstats
path: root/s390_build_fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 's390_build_fix.patch')
-rw-r--r--s390_build_fix.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/s390_build_fix.patch b/s390_build_fix.patch
deleted file mode 100644
index 6a24b611e..000000000
--- a/s390_build_fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 8e90b4b1305a80b1d7712370a163eff269ac1ba2 Mon Sep 17 00:00:00 2001
-From: Vasily Gorbik <gor@linux.ibm.com>
-Date: Mon, 26 Oct 2020 10:52:26 +0100
-Subject: 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 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 <gor@linux.ibm.com>
-Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
----
- 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 a996d3990a02b..0c2151451ba59 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;
---
-cgit 1.2.3-1.el7
-