Skip to content

Commit ff4c85c

Browse files
Brian GerstKAGA-KOKO
authored andcommitted
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@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20221115184328.70874-1-brgerst@gmail.com
1 parent ee92fa0 commit ff4c85c

1 file changed

Lines changed: 0 additions & 22 deletions

File tree

arch/x86/kernel/head_32.S

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -260,16 +260,6 @@ SYM_FUNC_START(startup_32_smp)
260260
/* Shift the stack pointer to a virtual address */
261261
addl $__PAGE_OFFSET, %esp
262262

263-
/*
264-
* start system 32-bit setup. We need to re-do some of the things done
265-
* in 16-bit mode for the "real" operations.
266-
*/
267-
movl setup_once_ref,%eax
268-
andl %eax,%eax
269-
jz 1f # Did we do this already?
270-
call *%eax
271-
1:
272-
273263
/*
274264
* Check if it is 486
275265
*/
@@ -331,18 +321,7 @@ SYM_FUNC_END(startup_32_smp)
331321

332322
#include "verify_cpu.S"
333323

334-
/*
335-
* setup_once
336-
*
337-
* The setup work we only want to run on the BSP.
338-
*
339-
* Warning: %esi is live across this function.
340-
*/
341324
__INIT
342-
setup_once:
343-
andl $0,setup_once_ref /* Once is enough, thanks */
344-
RET
345-
346325
SYM_FUNC_START(early_idt_handler_array)
347326
# 36(%esp) %eflags
348327
# 32(%esp) %cs
@@ -458,7 +437,6 @@ SYM_DATA(early_recursion_flag, .long 0)
458437
__REFDATA
459438
.align 4
460439
SYM_DATA(initial_code, .long i386_start_kernel)
461-
SYM_DATA(setup_once_ref, .long setup_once)
462440

463441
#ifdef CONFIG_PAGE_TABLE_ISOLATION
464442
#define PGD_ALIGN (2 * PAGE_SIZE)

0 commit comments

Comments
 (0)