x86/asm: Make more symbols local (30a2441c) · Commits · 戴 / test

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 ("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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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)

arch/x86/entry/entry_64.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

		/*

arch/x86/realmode/rm/wakeup_asm.S

+3 −3

Original line number	Diff line number	Diff line
		@@ -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)

Admin message