diff options
Diffstat (limited to 'arch/x86/ia32/ia32entry.S')
| -rw-r--r-- | arch/x86/ia32/ia32entry.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index e3e734005e19..eb48edd0cad2 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <asm/thread_info.h> | 13 | #include <asm/thread_info.h> |
| 14 | #include <asm/segment.h> | 14 | #include <asm/segment.h> |
| 15 | #include <asm/irqflags.h> | 15 | #include <asm/irqflags.h> |
| 16 | #include <asm/asm.h> | ||
| 16 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
| 17 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 18 | 19 | ||
| @@ -146,9 +147,7 @@ ENTRY(ia32_sysenter_target) | |||
| 146 | /* no need to do an access_ok check here because rbp has been | 147 | /* no need to do an access_ok check here because rbp has been |
| 147 | 32bit zero extended */ | 148 | 32bit zero extended */ |
| 148 | 1: movl (%rbp),%ebp | 149 | 1: movl (%rbp),%ebp |
| 149 | .section __ex_table,"a" | 150 | _ASM_EXTABLE(1b,ia32_badarg) |
| 150 | .quad 1b,ia32_badarg | ||
| 151 | .previous | ||
| 152 | orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET) | 151 | orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET) |
| 153 | testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) | 152 | testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) |
| 154 | CFI_REMEMBER_STATE | 153 | CFI_REMEMBER_STATE |