Skip to contentSkip to conversation

initramfs-fix-another-section-mismatch.patch removed from -mm tree

merged [email protected] 1 participant 1 message May 11, 2020

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: initramfs: fix another section mismatch
has been removed from the -mm tree. Its filename was
initramfs-fix-another-section-mismatch.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: initramfs: fix another section mismatch

Building with gcc-10 causes a harmless warning, similar to the gcc-4.6 warning that Geert fixed last year:

WARNING: modpost: vmlinux.o(.text.unlikely+0xe69): Section mismatch in reference from the function kexec_free_initrd() to the function .init.text:free_initrd_mem() The function kexec_free_initrd() references
the function __init free_initrd_mem().
This is often because kexec_free_initrd lacks a __init
annotation or the annotation of free_initrd_mem is wrong.

Add the missing __init annotations.

Fixes 4ada1e810038 ("initramfs: fix populate_initrd_image() section mismatch")
Fixes 23091e287355 ("initramfs: cleanup initrd freeing")
Cc Geert Uytterhoeven <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Steven Price <[email protected]>
Cc Alexander Viro <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc Russell King <[email protected]>
Cc Will Deacon <[email protected]>

---

 init/initramfs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
init/initramfs.c renamed from init/initramfs.c~initramfs-fix-another-section-mismatch +2 -2
@@ -542,7 +542,7 @@ void __weak free_initrd_mem(unsigned lon
 }
 
 #ifdef CONFIG_KEXEC_CORE
-static bool kexec_free_initrd(void)
+static bool __init kexec_free_initrd(void)
 {
 	unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
 	unsigned long crashk_end   = (unsigned long)__va(crashk_res.end);
@@ -565,7 +565,7 @@ static bool kexec_free_initrd(void)
 	return true;
 }
 #else
-static inline bool kexec_free_initrd(void)
+static inline bool __init kexec_free_initrd(void)
 {
 	return false;
 }

_

Patches currently in -mm which might be from [email protected] are

arm64-add-support-for-folded-p4d-page-tables-fix.patch bitops-avoid-clang-shift-count-overflow-warnings.patch ubsan-fix-gcc-10-warnings.patch