The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=13a31c43bf2cdd39d4be5aeff84b307ac42cfa03
commit 13a31c43bf2cdd39d4be5aeff84b307ac42cfa03 Author: Mark Johnston <[email protected]> AuthorDate: 2023-06-15 16:10:44 +0000 Commit: Mark Johnston <[email protected]> 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) {
