Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1981849pxx; Sat, 31 Oct 2020 04:45:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEml8ehzo/HOeRQnOSwC9m7Mz2/8hB9IZDDmLDRJ1jZnmkD8H6xTd1EaLojN4jyv3Loupt X-Received: by 2002:a17:906:388d:: with SMTP id q13mr6628724ejd.92.1604144755183; Sat, 31 Oct 2020 04:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604144755; cv=none; d=google.com; s=arc-20160816; b=qyRi5z0LDNllQIiNWoDvjJPr3NhxfIgIcCuTKcvJM3G9pssQ7QQigLEAsd7xzvHdJm f3rTQXafMQDGO9tE1MlSH3eRV8azfwts6Ueu8CZiYwRCBhoprZstg4+Gd+nnLDVijc3U zuSmzcTCQUsTRTgvxvKPchoD2ZW6cBLRZijgXneP5RLp1lTJKBlMdLUyTi+RiZtCdK9D TNXo86m6nDvwkHUhQ4h1Kp1x84Ts19+6Orqufuvw/10ZE6w6vOU7geDShA5qTMmxEz5g g5YG9h70nwAWb1huFDSDJLRdeVebcif1D/jdDs6nZS5Z9yxRwaG6c1inmbFhSmnxT1jf ngyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ihSUvFsLaRlzimyMZXoe3CR+rECulsiFt3YBoJz/MWk=; b=ln4aMtTvfw/Hh/sZXnPro2fRVBBKpNMC+O5a3L8hLiDoo9toJ7LAumVo57aVa+PxgP D26HlF9VcbmO36ycUcAKBxVhDQ/uFm/ahM+5on1l2SlskKQ8oQrfksfbaErwcgOcKOS8 eZolFOrUazNdUJvFutzhw2DceYCZa/+HSVA7wro2RI/pBka/g0yvfVHW9uhIFTmctVK2 pbg8sGqc4I1h+l/bpDEWyBSXyHrIkooFoiSP+K27Uies4vhsbTGIcIyVkSukp3Ccu/z0 aI77fKcgWhDhk/cGAfGAUAHV0/f/mrVHxF3g+WLkW7UtCGF+mHg4XgXQudDFqYIXVEwf 5Upg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qykULf1t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f4si7034019edw.10.2020.10.31.04.45.32; Sat, 31 Oct 2020 04:45:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qykULf1t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727320AbgJaLnU (ORCPT + 99 others); Sat, 31 Oct 2020 07:43:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:43164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727989AbgJaLnP (ORCPT ); Sat, 31 Oct 2020 07:43:15 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B64B4205F4; Sat, 31 Oct 2020 11:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144595; bh=I+TfRrtOHjm2xVC8apdTzw7RjU4U7ZFsLqAXwmihjcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qykULf1tVUR0FuO16sOBDSlGzLwcnIDkryZeGjl/S8b18sVbAHYH86STIotd5fBRV rrW5pFog+a1sxnlUXme8fbaPWVYakT4iTxkG8vQwcS8OqgebRNBL+C6sK2uMPsCg92 CeVcYFaUwf2xlEZvWQtORqYL/SPkPX/XAUFMqOP4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Vyukov , Thomas Gleixner Subject: [PATCH 5.8 51/70] x86/traps: Fix #DE Oops message regression Date: Sat, 31 Oct 2020 12:36:23 +0100 Message-Id: <20201031113501.945389765@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113459.481803250@linuxfoundation.org> References: <20201031113459.481803250@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner commit 5f1ec1fd32252af5130dac23b5542e8e66fe0bcb upstream. 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 Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/CACT4Y+bTZFkuZd7+bPArowOv-7Die+WZpfOWnEO_Wgs3U59+oA@mail.gmail.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -196,7 +196,7 @@ static __always_inline void __user *erro 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)); }