diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-02-25 23:16:30 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-05 11:28:02 +0200 |
| commit | 3dc77ca13cffe05e0a72793d138a555d2fe1d8bf (patch) | |
| tree | 8a9020e5afa070cdaf48c334973d9f874ec91190 /arch/x86/entry/entry_32.S | |
| parent | b2a0ada9b963a8e533e42281c80f052ff3ee607c (diff) | |
x86/entry/32: Convert IRET exception to IDTENTRY_SWentry-v4-part3
Convert the IRET exception handler to IDTENTRY_SW. This is slightly
different than the conversions of hardware exceptions as the IRET exception
is invoked via an exception table when IRET faults. So it just uses the
IDTENTRY_SW mechanism for consistency. It does not emit ASM code as it does
not fit the other idtentry exceptions.
- Implement the C entry point with DEFINE_IDTENTRY_SW() which maps to
DEFINE_IDTENTRY()
- Fixup the XEN/PV code
- Remove the old prototyoes
- Remove the RCU warning as the new entry macro ensures correctness
No functional change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/entry/entry_32.S')
| -rw-r--r-- | arch/x86/entry/entry_32.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 2913b9db2853..5dbed00876e2 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -1147,9 +1147,9 @@ restore_all_kernel: jmp .Lirq_return .section .fixup, "ax" -SYM_CODE_START(iret_exc) +SYM_CODE_START(asm_exc_iret_error) pushl $0 # no error code - pushl $do_iret_error + pushl $exc_iret_error #ifdef CONFIG_DEBUG_ENTRY /* @@ -1163,10 +1163,10 @@ SYM_CODE_START(iret_exc) popl %eax #endif - jmp common_exception -SYM_CODE_END(iret_exc) + jmp handle_exception +SYM_CODE_END(asm_exc_iret_error) .previous - _ASM_EXTABLE(.Lirq_return, iret_exc) + _ASM_EXTABLE(.Lirq_return, asm_exc_iret_error) SYM_FUNC_END(entry_INT80_32) .macro FIXUP_ESPFIX_STACK @@ -1293,7 +1293,7 @@ SYM_FUNC_END(name) #ifdef CONFIG_PARAVIRT SYM_CODE_START(native_iret) iret - _ASM_EXTABLE(native_iret, iret_exc) + _ASM_EXTABLE(native_iret, asm_exc_iret_error) SYM_CODE_END(native_iret) #endif @@ -1358,7 +1358,7 @@ SYM_FUNC_START(xen_failsafe_callback) popl %eax lea 16(%esp), %esp jz 5f - jmp iret_exc + jmp asm_exc_iret_error 5: pushl $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL ENCODE_FRAME_POINTER |