]> git.baikalelectronics.ru Git - kernel.git/commit
kexec_file: drop weak attribute from functions
authorNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Fri, 1 Jul 2022 07:34:04 +0000 (13:04 +0530)
committerMimi Zohar <zohar@linux.ibm.com>
Fri, 15 Jul 2022 16:21:16 +0000 (12:21 -0400)
commit630fd01c2262e5b3259952f7eca1b9a4976dec02
treef817af44876ffe1a701519817730333fc51659a9
parent90268676b28cdc9f334155ebe47333a287e53abd
kexec_file: drop weak attribute from functions

As requested
(http://lkml.kernel.org/r/87ee0q7b92.fsf@email.froward.int.ebiederm.org),
this series converts weak functions in kexec to use the #ifdef approach.

Quoting the 7410e16f79cb4 ("kexec_file: drop weak attribute from
arch_kexec_apply_relocations[_add]") changelog:

: Since commit d1bcae833b32f1 ("ELF: Don't generate unused section symbols")
: [1], binutils (v2.36+) started dropping section symbols that it thought
: were unused.  This isn't an issue in general, but with kexec_file.c, gcc
: is placing kexec_arch_apply_relocations[_add] into a separate
: .text.unlikely section and the section symbol ".text.unlikely" is being
: dropped.  Due to this, recordmcount is unable to find a non-weak symbol in
: .text.unlikely to generate a relocation record against.

This patch (of 2);

Drop __weak attribute from functions in kexec_file.c:
- arch_kexec_kernel_image_probe()
- arch_kimage_file_post_load_cleanup()
- arch_kexec_kernel_image_load()
- arch_kexec_locate_mem_hole()
- arch_kexec_kernel_verify_sig()

arch_kexec_kernel_image_load() calls into kexec_image_load_default(), so
drop the static attribute for the latter.

arch_kexec_kernel_verify_sig() is not overridden by any architecture, so
drop the __weak attribute.

Link: https://lkml.kernel.org/r/cover.1656659357.git.naveen.n.rao@linux.vnet.ibm.com
Link: https://lkml.kernel.org/r/2cd7ca1fe4d6bb6ca38e3283c717878388ed6788.1656659357.git.naveen.n.rao@linux.vnet.ibm.com
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Suggested-by: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
arch/arm64/include/asm/kexec.h
arch/powerpc/include/asm/kexec.h
arch/s390/include/asm/kexec.h
arch/x86/include/asm/kexec.h
include/linux/kexec.h
kernel/kexec_file.c