The following commit has been merged into the x86/alternatives branch of tip: Commit-ID: 05d277c9a9023e11d2f30a994bde08b854af52a0 Gitweb: https://git.kernel.org/tip/05d277c9a9023e11d2f30a994bde08b854af52a0 Author: Borislav Petkov (AMD) <bp@xxxxxxxxx> AuthorDate: Tue, 30 Jan 2024 11:59:41 +01:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Tue, 09 Apr 2024 18:16:57 +02:00 x86/alternatives: Sort local vars in apply_alternatives() In a reverse x-mas tree. No functional changes. Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Link: https://lore.kernel.org/r/20240130105941.19707-5-bp@xxxxxxxxx --- arch/x86/kernel/alternative.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 67dd7c3..7555c15 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -445,9 +445,9 @@ static int alt_replace_call(u8 *instr, u8 *insn_buff, struct alt_instr *a) void __init_or_module noinline apply_alternatives(struct alt_instr *start, struct alt_instr *end) { - struct alt_instr *a; - u8 *instr, *replacement; u8 insn_buff[MAX_PATCH_LEN]; + u8 *instr, *replacement; + struct alt_instr *a; DPRINTK(ALT, "alt table %px, -> %px", start, end);