Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

gcc-10: mark more functions __init to avoid section mismatch warnings

It seems that for whatever reason, gcc-10 ends up not inlining a couple
of functions that used to be inlined before. Even if they only have one
single callsite - it looks like gcc may have decided that the code was
unlikely, and not worth inlining.

The code generation difference is harmless, but caused a few new section
mismatch errors, since the (now no longer inlined) function wasn't in
the __init section, but called other init functions:

Section mismatch in reference from the function kexec_free_initrd() to the function .init.text:free_initrd_mem()
Section mismatch in reference from the function tpm2_calc_event_log_size() to the function .init.text:early_memremap()
Section mismatch in reference from the function tpm2_calc_event_log_size() to the function .init.text:early_memunmap()

So add the appropriate __init annotation to make modpost not complain.
In both cases there were trivially just a single callsite from another
__init function.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

+2 -2
+1 -1
drivers/firmware/efi/tpm.c
··· 16 16 int efi_tpm_final_log_size; 17 17 EXPORT_SYMBOL(efi_tpm_final_log_size); 18 18 19 - static int tpm2_calc_event_log_size(void *data, int count, void *size_info) 19 + static int __init tpm2_calc_event_log_size(void *data, int count, void *size_info) 20 20 { 21 21 struct tcg_pcr_event2_head *header; 22 22 int event_size, size = 0;
+1 -1
init/initramfs.c
··· 542 542 } 543 543 544 544 #ifdef CONFIG_KEXEC_CORE 545 - static bool kexec_free_initrd(void) 545 + static bool __init kexec_free_initrd(void) 546 546 { 547 547 unsigned long crashk_start = (unsigned long)__va(crashk_res.start); 548 548 unsigned long crashk_end = (unsigned long)__va(crashk_res.end);