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

Commit 1ce6f868 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.

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 d4541805

arch/x86/ia32/ia32entry.S

+2 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/thread_info.h>	

#include <asm/segment.h>

#include <asm/irqflags.h>

#include <asm/asm.h>

#include <linux/linkage.h>

#include <linux/err.h>
@@ -146,9 +147,7 @@ ENTRY(ia32_sysenter_target) 
 	/* no need to do an access_ok check here because rbp has been

 	   32bit zero extended */ 

1:	movl	(%rbp),%ebp

 	.section __ex_table,"a"

 	.quad 1b,ia32_badarg

 	.previous	

	_ASM_EXTABLE(1b,ia32_badarg)

	orl     $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)

	testl   $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)

	CFI_REMEMBER_STATE