The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: ff4c85c05333c6f24d3fe0a344c6dacd18a7ee49 Gitweb: https://git.kernel.org/tip/ff4c85c05333c6f24d3fe0a344c6dacd18a7ee49 Author: Brian Gerst <brgerst@xxxxxxxxx> AuthorDate: Tue, 15 Nov 2022 13:43:28 -05:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Fri, 02 Dec 2022 14:06:34 +01:00 x86/asm/32: Remove setup_once() After the removal of the stack canary segment setup code, this function does nothing. Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20221115184328.70874-1-brgerst@xxxxxxxxx --- arch/x86/kernel/head_32.S | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 9b7acc9..67c8ed9 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -261,16 +261,6 @@ SYM_FUNC_START(startup_32_smp) addl $__PAGE_OFFSET, %esp /* - * start system 32-bit setup. We need to re-do some of the things done - * in 16-bit mode for the "real" operations. - */ - movl setup_once_ref,%eax - andl %eax,%eax - jz 1f # Did we do this already? - call *%eax -1: - -/* * Check if it is 486 */ movb $4,X86 # at least 486 @@ -331,18 +321,7 @@ SYM_FUNC_END(startup_32_smp) #include "verify_cpu.S" -/* - * setup_once - * - * The setup work we only want to run on the BSP. - * - * Warning: %esi is live across this function. - */ __INIT -setup_once: - andl $0,setup_once_ref /* Once is enough, thanks */ - RET - SYM_FUNC_START(early_idt_handler_array) # 36(%esp) %eflags # 32(%esp) %cs @@ -458,7 +437,6 @@ SYM_DATA(early_recursion_flag, .long 0) __REFDATA .align 4 SYM_DATA(initial_code, .long i386_start_kernel) -SYM_DATA(setup_once_ref, .long setup_once) #ifdef CONFIG_PAGE_TABLE_ISOLATION #define PGD_ALIGN (2 * PAGE_SIZE)
|