* [PATCH] x86/asm: Make more symbols local
@ 2019-10-11 9:22 Jiri Slaby
2019-10-11 12:45 ` Borislav Petkov
2019-10-11 14:02 ` [tip: x86/asm] " tip-bot2 for Jiri Slaby
0 siblings, 2 replies; 3+ messages in thread
From: Jiri Slaby @ 2019-10-11 9:22 UTC (permalink / raw)
To: bp; +Cc: tglx, mingo, hpa, x86, linux-kernel, Jiri Slaby
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 <jslaby@suse.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] x86/asm: Make more symbols local
2019-10-11 9:22 [PATCH] x86/asm: Make more symbols local Jiri Slaby
@ 2019-10-11 12:45 ` Borislav Petkov
2019-10-11 14:02 ` [tip: x86/asm] " tip-bot2 for Jiri Slaby
1 sibling, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2019-10-11 12:45 UTC (permalink / raw)
To: Jiri Slaby; +Cc: tglx, mingo, hpa, x86, linux-kernel
On Fri, Oct 11, 2019 at 11:22:13AM +0200, Jiri Slaby wrote:
> During the assembly cleanup patchset reveiew, I found more symbols which
"review"
> 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 <jslaby@suse.cz>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@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(-)
other than that:
Acked-by: Borislav Petkov <bp@suse.de>
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip: x86/asm] x86/asm: Make more symbols local
2019-10-11 9:22 [PATCH] x86/asm: Make more symbols local Jiri Slaby
2019-10-11 12:45 ` Borislav Petkov
@ 2019-10-11 14:02 ` tip-bot2 for Jiri Slaby
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Jiri Slaby @ 2019-10-11 14:02 UTC (permalink / raw)
To: linux-tip-commits
Cc: Jiri Slaby, Borislav Petkov, Linus Torvalds, Peter Zijlstra,
Thomas Gleixner, bp, hpa, Ingo Molnar, linux-kernel
The following commit has been merged into the x86/asm branch of tip:
Commit-ID: 30a2441cae7b149ff484a697bf9eb8de53240a4f
Gitweb: https://git.kernel.org/tip/30a2441cae7b149ff484a697bf9eb8de53240a4f
Author: Jiri Slaby <jslaby@suse.cz>
AuthorDate: Fri, 11 Oct 2019 11:22:13 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 11 Oct 2019 15:56:30 +02:00
x86/asm: Make more symbols local
During the assembly cleanup patchset review, 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 <jslaby@suse.cz>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Link: https://lkml.kernel.org/r/20191011092213.31470-1-jslaby@suse.cz
Signed-off-by: Ingo Molnar <mingo@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 c22f9a7..ea88d52 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 b7c3ea4..86cbb22 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 05ac9c1..dad6198 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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-11 14:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-11 9:22 [PATCH] x86/asm: Make more symbols local Jiri Slaby
2019-10-11 12:45 ` Borislav Petkov
2019-10-11 14:02 ` [tip: x86/asm] " tip-bot2 for Jiri Slaby
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).