x86/relocate_kernel: Use named labels for less confusion

That identity_mapped() function was loving that "1" label to the point of
completely confusing its readers.

Use named labels in each place for clarity.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Link: https://lore.kernel.org/r/20240614095904.1345461-6-kirill.shutemov@linux.intel.com

diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index 54e620021c7e824c5cff8ef50cde6d450470020e..8b8922de37659c91500d9d45d71d426f283e337f 100644 (file)
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -148,9 +148,10 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped)
         */
        movl    $X86_CR4_PAE, %eax
        testq   $X86_CR4_LA57, %r13
-       jz      1f
+       jz      .Lno_la57
        orl     $X86_CR4_LA57, %eax
-1:
+.Lno_la57:
+
        movq    %rax, %cr4
 
        /* Flush the TLB (needed?) */
@@ -162,9 +163,9 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped)
         * used by kexec. Flush the caches before copying the kernel.
         */
        testq   %r12, %r12
-       jz 1f
+       jz .Lsme_off
        wbinvd
-1:
+.Lsme_off:
 
        movq    %rcx, %r11
        call    swap_pages
@@ -184,7 +185,7 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped)
         */
 
        testq   %r11, %r11
-       jnz 1f
+       jnz .Lrelocate
        xorl    %eax, %eax
        xorl    %ebx, %ebx
        xorl    %ecx, %ecx
@@ -205,7 +206,7 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped)
        ret
        int3
 
-1:
+.Lrelocate:
        popq    %rdx
        leaq    PAGE_SIZE(%r10), %rsp
        ANNOTATE_RETPOLINE_SAFE