From nobody Fri Jun 23 13:53:41 2023 X-Original-To: dev-commits-src-branches@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 4Qndxd61Hwz4gJYL; Fri, 23 Jun 2023 13:53:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qndxd5Jd8z4lM9; Fri, 23 Jun 2023 13:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687528421; 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=3zvlhes1V/2tFM2j1D1iDEASSnhhocHHttFpxGt3V/Y=; b=YMi3jmbeS0plW3xmCdDYWjP2ed578of89jzwFnjqUaxFzvlzh32OFCvwpSXt+KIvuErIli 7ZAXsuQEHY49bZ9ZU7MPnFsietpJLn64hwSH2LCAVdWLdNpv6rvOx81x1LOX9tA5aSYOPp ufWvJVBvoD5ly8IfueORZ7theGleyF7RXslp5cVRATE3ggBBK6Hx2J4BtHC/JTiyuLZwFn bWykhIhRi0Mxo4y/26vDU2r2518z2GEV9xt2O3OvUvkOgjDHPUsg/DILxSNXtk9iuRvYOe JXtcGlOyrTm23VqVRKnTkRMFdh2y8GjxexMZr9Fpj/h4qlIm0GKW+XisuQu7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687528421; 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=3zvlhes1V/2tFM2j1D1iDEASSnhhocHHttFpxGt3V/Y=; b=j+xAnxVOPhBf8qutCzQq5V8iBxBbUYPW1sFEx6mFtF3na8Axse2Ul+bqnmfHKKuWRjNb5X HQlb7opitBly4F0ROoi+gO4b6T9AxEc5rpm6diQIXLHWTcfbMh/TPp5MmHtD0aH4PUjRoB Vpz2QfKCRZAE1R7CxDwd3MBvUYG+0s1AJiqqPKPd7fm2BWalEsgR7S6tNlbs8L8xOOwrEC 4O44o/YhdxzvTo1Vad3MZ0hE8NjW3MoVgxNCSUQ5YeEuAHK7UR86lUvUnKCl9d7o8VYnK7 m/KYUhf8FF7oTMp5RfpT1j73zCucBDzJwWX3dcgTPHzIrUBPu8JSHFtJ+LZU5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687528421; a=rsa-sha256; cv=none; b=mrSc09U3pqHw0QiNMhHqnlR57Qcv140q9uJNLEVZBa1zhn3KdiCW5TYy5/lID21/egq+Lp EINuMreOrD5Fp313/xeLGiG5HMu0XTzzVdnml9TJD2+ISc9xk1KtfJ4/Gt2uayDu5vj0SK hYArW7cqTvJNmo0ETmlyYbFl143v2fJ65mL/Dx4MnmScw9HhaRe/zUJFarQe9SZywyHT1H AcqHdkE+U4E5poPUO7bwLuWA31RLoIj2xLvkRs+x30hcji6jtAglh6zH1OHOdZ2kIsbfdu gIi8x6PTEQV46w586BKOotg8HI9orzLi3mxs880+ADtACXW9xhC6MSc+4avakw== 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 4Qndxd4Mqdz16Ry; Fri, 23 Jun 2023 13:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NDrfD7020894; Fri, 23 Jun 2023 13:53:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NDrfYc020893; Fri, 23 Jun 2023 13:53:41 GMT (envelope-from git) Date: Fri, 23 Jun 2023 13:53:41 GMT Message-Id: <202306231353.35NDrfYc020893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 13a31c43bf2c - stable/13 - arm64: Remove struct arm64_frame List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 13a31c43bf2cdd39d4be5aeff84b307ac42cfa03 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=13a31c43bf2cdd39d4be5aeff84b307ac42cfa03 commit 13a31c43bf2cdd39d4be5aeff84b307ac42cfa03 Author: Mark Johnston AuthorDate: 2023-06-15 16:10:44 +0000 Commit: Mark Johnston CommitDate: 2023-06-23 13:34:25 +0000 arm64: Remove struct arm64_frame It was used in one place and was added specifically to support dtrace stack unwinding code. Write an equivalent expression using struct unwind_state instead. No functional change intended. Reviewed by: andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40538 (cherry picked from commit d3251842321e7a5ac8bbb2aec128328cd10f3a84) --- sys/arm64/include/frame.h | 5 ----- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/arm64/include/frame.h b/sys/arm64/include/frame.h index 0a8b53ebb01e..5033e887a094 100644 --- a/sys/arm64/include/frame.h +++ b/sys/arm64/include/frame.h @@ -50,11 +50,6 @@ struct trapframe { uint64_t tf_x[30]; }; -struct arm64_frame { - struct arm64_frame *f_frame; - u_long f_retaddr; -}; - /* * Signal frame, pushed onto the user stack. */ diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index 8e184591b916..79d035d10972 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -137,7 +137,7 @@ dtrace_getustack_common(uint64_t *pcstack, int pcstack_limit, uintptr_t pc, break; pc = dtrace_fuword64((void *)(fp + - offsetof(struct arm64_frame, f_retaddr))); + offsetof(struct unwind_state, pc))); fp = dtrace_fuword64((void *)fp); if (fp == oldfp) {