From nobody Sun Dec 15 17:48:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB9Y16Fj0z5h638; Sun, 15 Dec 2024 17:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB9Y15Gnxz4Khj; Sun, 15 Dec 2024 17:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734284917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PudYRk3PHPXkufnYeETy3/O2AYnYYmEkhSassYwlhFY=; b=HL9Ne3yNqjiJQp7sDi5dMnArjISPMea9fZXja0JNsUaoJEHfKGJ/k4PCYdb3coK2Y271Es PAVrGWSs2MvFM098oLU2I904nQj++kLXpMoEyqPzdEMlROceNHdwZKSn6cf2crBMCUrpks ONxNNnLETm+5YJXAAXGVrXGZN5b9auT0a56pU37CKjjNhazuqEfV1Ldu4/9rDUt6k4iP6H T+xtQZ2iiAgJlDYU2Knbjf7VJOcKmxTevG3Fn+r6lKjfRzgnvAcsuZ3a5OLh7yMKu+6QMc bvyfBJqFQveiK4NjBOEzqudMDpCMVekRbY2Zbp6zTaV4j8tIflJhLJH41s0W7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734284917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PudYRk3PHPXkufnYeETy3/O2AYnYYmEkhSassYwlhFY=; b=GdwnXvTyN5hDep80491fhMx0o3N1bPlB7w9YXe3zwXQVihNhK97zRV6L1nU9KjbAAgD1a0 A+zu5tf4DOdo9KrM3HUNyU1Jo+9BO59eKtry8uhorusT2uyWEIBrZ277L1exs1Cdk6YZTh /eFvTmD0Pfurz396Vq8rpMDV9CDL8vlX93DXm9cQOkqEb5tFzUrUVBZAOzJ7kxIxNfRvMY 8jD84gkmgyGWnvDK8boG7Jz/IqdAuXnShc66iAOZQEOxypDPvuRr3S5k/eqEkVJ3e+r+bi nE4kPl7MrqmPUchRjSQ2g/+W8ah6bLy578XOMJGt3CYJ8ObZGeGgCLAwei1DlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734284917; a=rsa-sha256; cv=none; b=STIYfLAm+nTc2HA+XptO53Scl+rE8kOjvTdHTvtbbAyaekerMce7xBjknV3JZ2gqC3zams DFBUABB5kCs0Yv8M0IzOV3RjVdPlwHOXtqEk7yWRkA830S07aPUJYji6JPQIgyMmkwSRsd mnFPCjl+RvyL0RhYlJ9AQyyHpRly2IGxYqnUF3j0PoUTd2aDNJMC9qjXagHvaazl1M+Mug vXjLSIWtPw/3yfevHt117xbHOtK3UrwYqXegZ8evd476I20GGMLgPUQ3I0paitcrHb1f+u jI6RP2WGftv3/ZHo1fcO4ExvU6Ulz/C4JzPMShG0r0mCdX9U1YRqduOcqP6RrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB9Y14l26zJ2l; Sun, 15 Dec 2024 17:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BFHmbax003066; Sun, 15 Dec 2024 17:48:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFHmb0f003063; Sun, 15 Dec 2024 17:48:37 GMT (envelope-from git) Date: Sun, 15 Dec 2024 17:48:37 GMT Message-Id: <202412151748.4BFHmb0f003063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 3342e5967dc7 - main - i386: Fix incorrect NMI handler invocations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3342e5967dc7193d97f99a92b81824db81efe2f1 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=3342e5967dc7193d97f99a92b81824db81efe2f1 commit 3342e5967dc7193d97f99a92b81824db81efe2f1 Author: Bojan Novković AuthorDate: 2024-12-15 17:44:34 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 17:47:52 +0000 i386: Fix incorrect NMI handler invocations Fixes: 459dc42 --- sys/i386/i386/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 9e310c049daa..a8b7df42a283 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -428,7 +428,7 @@ user_trctrap_out: } return; #else /* !POWERFAIL_NMI */ - nmi_handle_intr(type, frame); + nmi_handle_intr(frame); return; #endif /* POWERFAIL_NMI */ @@ -685,7 +685,7 @@ kernel_trctrap: } return; #else /* !POWERFAIL_NMI */ - nmi_handle_intr(type, frame); + nmi_handle_intr(frame); return; #endif /* POWERFAIL_NMI */ }