Messages in this thread Patch in this message | | | Date | Sat, 13 May 2023 16:10:37 -0000 | From | "tip-bot2 for Borislav Petkov (AMD)" <> | Subject | [tip: x86/alternatives] x86/alternatives: Fix section mismatch warnings |
| |
The following commit has been merged into the x86/alternatives branch of tip:
Commit-ID: d42a2a89121071cc8dd285235253a4c739641635 Gitweb: https://git.kernel.org/tip/d42a2a89121071cc8dd285235253a4c739641635 Author: Borislav Petkov (AMD) <bp@alien8.de> AuthorDate: Sat, 13 May 2023 16:01:39 +02:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Sat, 13 May 2023 18:04:42 +02:00
x86/alternatives: Fix section mismatch warnings
Fix stuff like:
WARNING: modpost: vmlinux.o: section mismatch in reference: \ __optimize_nops (section: .text) -> debug_alternative (section: .init.data)
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230513160146.16039-1-bp@alien8.de --- arch/x86/kernel/alternative.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 3bb0a5f..93aa95a 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -193,8 +193,8 @@ static int skip_nops(u8 *instr, int offset, int len) * Optimize a sequence of NOPs, possibly preceded by an unconditional jump * to the end of the NOP sequence into a single NOP. */ -static bool __optimize_nops(u8 *instr, size_t len, struct insn *insn, - int *next, int *prev, int *target) +static bool __init_or_module +__optimize_nops(u8 *instr, size_t len, struct insn *insn, int *next, int *prev, int *target) { int i = *next - insn->length; @@ -765,7 +765,7 @@ void __init_or_module noinline apply_returns(s32 *start, s32 *end) { } #ifdef CONFIG_X86_KERNEL_IBT -static void poison_endbr(void *addr, bool warn) +static void __init_or_module poison_endbr(void *addr, bool warn) { u32 endbr, poison = gen_endbr_poison();
| |