diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-07-23 01:00:08 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-07-24 16:05:01 +0300 |
| commit | a27a0a55495cdde4b8d98f82460dc46eb44777fd (patch) | |
| tree | 2456c8bb3bd8e6c3734446ecc63642b0b1d429ad /arch/x86/kernel/traps.c | |
| parent | bdcd178ada90d2413bcc9df4211dcdd511a47586 (diff) | |
| download | linux-a27a0a55495cdde4b8d98f82460dc46eb44777fd.tar.xz | |
x86/entry: Cleanup idtentry_enter/exit
Remove the temporary defines and fixup all references.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20200722220520.855839271@linutronix.de
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 59c7f54753b4..be8fcfec004a 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -245,7 +245,7 @@ static noinstr bool handle_bug(struct pt_regs *regs) DEFINE_IDTENTRY_RAW(exc_invalid_op) { - idtentry_state_t state; + irqentry_state_t state; /* * We use UD2 as a short encoding for 'CALL __WARN', as such @@ -255,11 +255,11 @@ DEFINE_IDTENTRY_RAW(exc_invalid_op) if (!user_mode(regs) && handle_bug(regs)) return; - state = idtentry_enter(regs); + state = irqentry_enter(regs); instrumentation_begin(); handle_invalid_op(regs); instrumentation_end(); - idtentry_exit(regs, state); + irqentry_exit(regs, state); } DEFINE_IDTENTRY(exc_coproc_segment_overrun) |