From nobody Fri Mar 27 01:52:31 2026 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 4fhkDJ4zbqz6WYSc for ; Fri, 27 Mar 2026 01:52:32 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhkDH65D7z418H for ; Fri, 27 Mar 2026 01:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774576351; 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=UoO7vXjDYH5p4Wk438DuJ3z2qNy2n4giJmxp2kgWSuk=; b=JLZov5XWn1w7+9fey+WSBR9jiekVSAQjiyoluAES5V7jJbcPFqPjORL2FvDhP4jvVPkV0v iODbLxPCB6Lza2xGEO/qN76HvJUev3jDU6ovtwGguVlE5HYCkt0OXd1ZaRieUOyZCAs1Zn C1YYPp5nHBdju+8hUXMVX+VJKT4Nd0ffKoYGuuzPUDfFP8F9vnc3yzAr+nXcU75pKkvMhq nzaSSSIYXmdsacMzQYcxILHsvPF+YNCADfF82CC+qTr5NQ5KQY5T1+E9yd8gqzlC23udU7 uYwVQ+dS10l3M6AG6s1iP4TecDSli1g9l3ou7i//c641qOJwYlGBz2ffRkxiRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774576351; a=rsa-sha256; cv=none; b=L/u5zaFQuShUZCTNQVZTLd/wVwrU2RD9RuewNb5MMs8k4laSvViKCOKvZ1IuNkXVapn4IH 3KFLLbB0je4XHD42ZH1kborZslic33xgpC4DUcWBmbefFchuh0/mUdD3NCry2M6bsEFjiO WrIs+nIiaXCP5TzBRO5k1t499JsePKvMjje13MpMu57mHibYgJOBl8elvBt1M16+9QPa3q hEovm2QDZvOf+lhCVxTr4IhFMbtirI7xo1yBcgGi6+c1KcliYMvA4VKXIQMWF4pfI2l4kI RJvNWNnkEecSJQonJyNidljZ0EC2VybVZJImUa2I5s9FCU1fLnRwp7Fr9P371Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774576351; 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=UoO7vXjDYH5p4Wk438DuJ3z2qNy2n4giJmxp2kgWSuk=; b=VM0jVcEgQZWqJsLZwHYEJPmsVapAL4GnNK3FRHxr2I8bQc2HghwvU0fJqKGlTsBoAJTX10 1/E1wbS7ufBTce03HmV5ebNIQijkDtV2FkxGp4xi4O43cNqsAObHtrYKSPy5C5PhGn8IGj tlhW8wr2WSFJp5l+xaXMMwQDO5LW5Ymn3xPEdQDxNXHbCj7og2DooxDAHvUlVzjIE8Fo3e 0uYqrcVSLuQsM9izgFW5eaP/IJ4mLtFSfTjP+Fk1lkpTWhzVz2WLedGdKDR3KOlsdLhVz6 JV7PI68bEv45fkOG6RrP9GaCfPCarR5PWTVXamFPKRkgTARBDAXWMXPrPQsl2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhkDH5cLyz3Jk for ; Fri, 27 Mar 2026 01:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Mar 2026 01:52:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8823ca95fd45 - stable/15 - amd64: revert back struct trapframe to the pre-FRED definition 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8823ca95fd45455d24a7bdd1d573b651932c3c54 Auto-Submitted: auto-generated Date: Fri, 27 Mar 2026 01:52:31 +0000 Message-Id: <69c5e2df.1ea2a.15c9260b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8823ca95fd45455d24a7bdd1d573b651932c3c54 commit 8823ca95fd45455d24a7bdd1d573b651932c3c54 Author: Konstantin Belousov AuthorDate: 2026-03-21 22:26:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-26 23:42:57 +0000 amd64: revert back struct trapframe to the pre-FRED definition (cherry picked from commit 1ba29614c4ce5e261ade0bd7def94079b7b9647a) --- sys/x86/include/frame.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/x86/include/frame.h b/sys/x86/include/frame.h index a6444d55cfaf..b8e090ff95d0 100644 --- a/sys/x86/include/frame.h +++ b/sys/x86/include/frame.h @@ -152,6 +152,10 @@ struct trapframe { uint16_t tf_ss; uint16_t tf_fred_evinfo1; uint32_t tf_fred_evinfo2; +}; + +struct trapframe_fred { + struct trapframe tf_idt; /* two long words added by FRED */ uint64_t tf_fred_evdata; uint64_t tf_fred_zero1;