During the assembly cleanup patchset reveiew, I found more symbols which
are used only locally. So make them really local by prepending ".L" to
them. Namely:
* wakeup_idt is used only in realmode/rm/wakeup_asm.S.
* in_pm32 is used only in boot/pmjump.S.
* retint_user is used only in entry/entry_64.S, perhaps since commit
  2ec67971facc ("x86/entry/64/compat: Remove most of the fast system
  call machinery"), where entry_64_compat's caller was removed.

Drop GLOBAL from all of them too. I do not see more candidates in the
series.

Signed-off-by: Jiri Slaby <jsl...@suse.cz>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Borislav Petkov <b...@alien8.de>
Cc: "H. Peter Anvin" <h...@zytor.com>
Cc: x...@kernel.org
---
 arch/x86/boot/pmjump.S            | 6 +++---
 arch/x86/entry/entry_64.S         | 4 ++--
 arch/x86/realmode/rm/wakeup_asm.S | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S
index c22f9a7d1aeb..ea88d52eeac7 100644
--- a/arch/x86/boot/pmjump.S
+++ b/arch/x86/boot/pmjump.S
@@ -40,13 +40,13 @@ GLOBAL(protected_mode_jump)
 
        # Transition to 32-bit mode
        .byte   0x66, 0xea              # ljmpl opcode
-2:     .long   in_pm32                 # offset
+2:     .long   .Lin_pm32               # offset
        .word   __BOOT_CS               # segment
 ENDPROC(protected_mode_jump)
 
        .code32
        .section ".text32","ax"
-GLOBAL(in_pm32)
+.Lin_pm32:
        # Set up data segments for flat 32-bit mode
        movl    %ecx, %ds
        movl    %ecx, %es
@@ -72,4 +72,4 @@ GLOBAL(in_pm32)
        lldt    %cx
 
        jmpl    *%eax                   # Jump to the 32-bit entrypoint
-ENDPROC(in_pm32)
+ENDPROC(.Lin_pm32)
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index b7c3ea4cb19d..86cbb22208c8 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -616,7 +616,7 @@ ret_from_intr:
        jz      retint_kernel
 
        /* Interrupt came from user space */
-GLOBAL(retint_user)
+.Lretint_user:
        mov     %rsp,%rdi
        call    prepare_exit_to_usermode
        TRACE_IRQS_IRETQ
@@ -1372,7 +1372,7 @@ ENTRY(error_exit)
        TRACE_IRQS_OFF
        testb   $3, CS(%rsp)
        jz      retint_kernel
-       jmp     retint_user
+       jmp     .Lretint_user
 END(error_exit)
 
 /*
diff --git a/arch/x86/realmode/rm/wakeup_asm.S 
b/arch/x86/realmode/rm/wakeup_asm.S
index 05ac9c17c811..dad6198f1a26 100644
--- a/arch/x86/realmode/rm/wakeup_asm.S
+++ b/arch/x86/realmode/rm/wakeup_asm.S
@@ -73,7 +73,7 @@ ENTRY(wakeup_start)
        movw    %ax, %fs
        movw    %ax, %gs
 
-       lidtl   wakeup_idt
+       lidtl   .Lwakeup_idt
 
        /* Clear the EFLAGS */
        pushl $0
@@ -171,8 +171,8 @@ END(wakeup_gdt)
 
        /* This is the standard real-mode IDT */
        .balign 16
-GLOBAL(wakeup_idt)
+.Lwakeup_idt:
        .word   0xffff          /* limit */
        .long   0               /* address */
        .word   0
-END(wakeup_idt)
+END(.Lwakeup_idt)
-- 
2.23.0

Reply via email to