| Message ID | 160261087970.7002.5363547782831704972.tip-bot2@tip-bot2 |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [tip:,x86/urgent] x86/traps: Fix #DE Oops message regression | expand |
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 81a2fb7..316ce1c 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -195,7 +195,7 @@ static __always_inline void __user *error_get_trap_addr(struct pt_regs *regs) DEFINE_IDTENTRY(exc_divide_error) { - do_error_trap(regs, 0, "divide_error", X86_TRAP_DE, SIGFPE, + do_error_trap(regs, 0, "divide error", X86_TRAP_DE, SIGFPE, FPE_INTDIV, error_get_trap_addr(regs)); }
The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 5f1ec1fd32252af5130dac23b5542e8e66fe0bcb Gitweb: https://git.kernel.org/tip/5f1ec1fd32252af5130dac23b5542e8e66fe0bcb Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Mon, 12 Oct 2020 15:11:47 +02:00 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Tue, 13 Oct 2020 19:17:33 +02:00 x86/traps: Fix #DE Oops message regression The conversion of #DE to the idtentry mechanism introduced a change in the Ooops message which confuses tools which parse crash information in dmesg. Remove the underscore from 'divide_error' to restore previous behaviour. Fixes: 9d06c4027f21 ("x86/entry: Convert Divide Error to IDTENTRY") Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/CACT4Y+bTZFkuZd7+bPArowOv-7Die+WZpfOWnEO_Wgs3U59+oA@mail.gmail.com --- arch/x86/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)