x86/asm/32: Remove setup_once()
authorBrian Gerst <brgerst@gmail.com>
Tue, 15 Nov 2022 18:43:28 +0000 (13:43 -0500)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 2 Dec 2022 13:06:34 +0000 (14:06 +0100)
After the removal of the stack canary segment setup code, this function
does nothing.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20221115184328.70874-1-brgerst@gmail.com
arch/x86/kernel/head_32.S

index 9b7acc9c7874c135fc83d4e62806977e01837212..67c8ed99144b7a55c4e1665992da2a69c3bec445 100644 (file)
@@ -260,16 +260,6 @@ SYM_FUNC_START(startup_32_smp)
        /* Shift the stack pointer to a virtual address */
        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
  */
@@ -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)