Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74acf0e authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/entry/64_compat: Make labels local 



... so that they don't appear as symbols in the final ELF.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1449916077-6506-1-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d51953b0

arch/x86/entry/entry_64_compat.S

+5 −5
Original line number Diff line number Diff line
@@ -96,15 +96,15 @@ ENTRY(entry_SYSENTER_compat) 
	 * This needs to happen before enabling interrupts so that

	 * we don't get preempted with NT set.

	 *

	 * NB.: sysenter_fix_flags is a label with the code under it moved

	 * NB.: .Lsysenter_fix_flags is a label with the code under it moved

	 * out-of-line as an optimization: NT is unlikely to be set in the

	 * majority of the cases and instead of polluting the I$ unnecessarily,

	 * we're keeping that code behind a branch which will predict as

	 * not-taken and therefore its instructions won't be fetched.

	 */

	testl	$X86_EFLAGS_NT, EFLAGS(%rsp)

	jnz	sysenter_fix_flags

sysenter_flags_fixed:

	jnz	.Lsysenter_fix_flags

.Lsysenter_flags_fixed:



	/*

	 * User mode is traced as though IRQs are on, and SYSENTER
@@ -119,10 +119,10 @@ sysenter_flags_fixed: 
		    "jmp .Lsyscall_32_done", X86_FEATURE_XENPV

	jmp	sysret32_from_system_call



sysenter_fix_flags:

.Lsysenter_fix_flags:

	pushq	$X86_EFLAGS_FIXED

	popfq

	jmp	sysenter_flags_fixed

	jmp	.Lsysenter_flags_fixed

ENDPROC(entry_SYSENTER_compat)



/*