Commit 16e617d0 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/entry_64: Remove .fixup usage 



Place the anonymous .fixup code at the tail of the regular functions.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarLai Jiangshan <jiangshanlai@gmail.com>
Link: https://lore.kernel.org/r/20211110101325.186049322@infradead.org
parent ab0fedcc

arch/x86/entry/entry_64.S

+6 −7
Original line number Diff line number Diff line
@@ -739,13 +739,9 @@ SYM_FUNC_START(asm_load_gs_index) 
	swapgs

	FRAME_END

	RET

SYM_FUNC_END(asm_load_gs_index)

EXPORT_SYMBOL(asm_load_gs_index)



	_ASM_EXTABLE(.Lgs_change, .Lbad_gs)

	.section .fixup, "ax"

	/* running with kernelgs */

SYM_CODE_START_LOCAL_NOALIGN(.Lbad_gs)

.Lbad_gs:

	swapgs					/* switch back to user gs */

.macro ZAP_GS

	/* This can't be a string because the preprocessor needs to see it. */
@@ -756,8 +752,11 @@ SYM_CODE_START_LOCAL_NOALIGN(.Lbad_gs) 
	xorl	%eax, %eax

	movl	%eax, %gs

	jmp	2b

SYM_CODE_END(.Lbad_gs)

	.previous



	_ASM_EXTABLE(.Lgs_change, .Lbad_gs)



SYM_FUNC_END(asm_load_gs_index)

EXPORT_SYMBOL(asm_load_gs_index)



#ifdef CONFIG_XEN_PV

/*