Merge tag 'objtool-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel...

[thirdparty/linux.git] / arch / x86 / kernel / head_64.S

diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 6a8238702eabb5ed7d84107fbef7fdabfaae13a5..a5df3e994f04f10f2c9fb814bf6f952a6452ae7a 100644 (file)
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -42,7 +42,7 @@ L3_START_KERNEL = pud_index(__START_KERNEL_map)
        __HEAD
        .code64
 SYM_CODE_START_NOALIGN(startup_64)
-       UNWIND_HINT_EMPTY
+       UNWIND_HINT_END_OF_STACK
        /*
         * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0,
         * and someone has loaded an identity mapped page table
@@ -97,7 +97,7 @@ SYM_CODE_START_NOALIGN(startup_64)
        lretq
 
 .Lon_kernel_cs:
-       UNWIND_HINT_EMPTY
+       UNWIND_HINT_END_OF_STACK
 
        /* Sanitize CPU configuration */
        call verify_cpu
@@ -119,7 +119,7 @@ SYM_CODE_START_NOALIGN(startup_64)
 SYM_CODE_END(startup_64)
 
 SYM_CODE_START(secondary_startup_64)
-       UNWIND_HINT_EMPTY
+       UNWIND_HINT_END_OF_STACK
        ANNOTATE_NOENDBR
        /*
         * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0,
@@ -148,7 +148,7 @@ SYM_CODE_START(secondary_startup_64)
         * verify_cpu() above to make sure NX is enabled.
         */
 SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL)
-       UNWIND_HINT_EMPTY
+       UNWIND_HINT_END_OF_STACK
        ANNOTATE_NOENDBR
 
        /*
@@ -230,7 +230,7 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL)
        ANNOTATE_RETPOLINE_SAFE
        jmp     *%rax
 1:
-       UNWIND_HINT_EMPTY
+       UNWIND_HINT_END_OF_STACK
        ANNOTATE_NOENDBR // above
 
 #ifdef CONFIG_SMP
@@ -383,7 +383,7 @@ SYM_CODE_END(secondary_startup_64)
  */
 SYM_CODE_START(start_cpu0)
        ANNOTATE_NOENDBR
-       UNWIND_HINT_EMPTY
+       UNWIND_HINT_END_OF_STACK
 
        /* Find the idle task stack */
        movq    PER_CPU_VAR(pcpu_hot) + X86_current_task, %rcx
@@ -406,8 +406,6 @@ SYM_CODE_START_NOALIGN(vc_boot_ghcb)
        UNWIND_HINT_IRET_REGS offset=8
        ENDBR
 
-       ANNOTATE_UNRET_END
-
        /* Build pt_regs */
        PUSH_AND_CLEAR_REGS
 
@@ -460,7 +458,6 @@ SYM_CODE_END(early_idt_handler_array)
 
 SYM_CODE_START_LOCAL(early_idt_handler_common)
        UNWIND_HINT_IRET_REGS offset=16
-       ANNOTATE_UNRET_END
        /*
         * The stack is the hardware frame, an error code or zero, and the
         * vector number.
@@ -510,8 +507,6 @@ SYM_CODE_START_NOALIGN(vc_no_ghcb)
        UNWIND_HINT_IRET_REGS offset=8
        ENDBR
 
-       ANNOTATE_UNRET_END
-
        /* Build pt_regs */
        PUSH_AND_CLEAR_REGS