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

Commit a3e859fe authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, extable: Remove open-coded exception table entries in arch/x86/ia32/ia32entry.S



Remove open-coded exception table entries in arch/x86/ia32/ia32entry.S,
and replace them with _ASM_EXTABLE() macros; this will allow us to
change the format and type of the exception table entries.

This one was missed from the previous patch to this file.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: David Daney <david.daney@cavium.com>
Link: http://lkml.kernel.org/r/CA%2B55aFyijf43qSu3N9nWHEBwaGbb7T2Oq9A=9EyR=Jtyqfq_cQ@mail.gmail.com
parent 7a040a43
Loading
Loading
Loading
Loading
+1 −3
Original line number Original line Diff line number Diff line
@@ -302,9 +302,7 @@ ENTRY(ia32_cstar_target)
	   32bit zero extended */ 
	   32bit zero extended */ 
	/* hardware stack frame is complete now */	
	/* hardware stack frame is complete now */	
1:	movl	(%r8),%r9d
1:	movl	(%r8),%r9d
	.section __ex_table,"a"
	_ASM_EXTABLE(1b,ia32_badarg)
	.quad 1b,ia32_badarg
	.previous	
	orl     $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
	orl     $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
	testl   $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
	testl   $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
	CFI_REMEMBER_STATE
	CFI_REMEMBER_STATE