Index: sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
===================================================================
--- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
+++ sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
@@ -70,7 +70,7 @@
 {
 	struct unwind_state state;
 	int scp_offset;
-	register_t sp;
+	register_t sp, fp;
 	int depth;
 
 	depth = 0;
@@ -88,12 +88,19 @@
 	state.pc = (uint64_t)dtrace_getpcstack;
 
 	while (depth < pcstack_limit) {
-		if (unwind_frame(&state))
+		fp = state.fp;
+		if (!INKERNEL(fp))
 			break;
 
 		if (!INKERNEL(state.pc) || !INKERNEL(state.fp))
 			break;
 
+		state.sp = fp + 0x10;
+		/* FP to previous frame (X29) */
+		state.fp = *(register_t *)(fp);
+		/* LR (X30) */
+		state.pc = *(register_t *)(fp + 8) - 4;
+
 		/*
 		 * NB: Unlike some other architectures, we don't need to
 		 * explicitly insert cpu_dtrace_caller as it appears in the