From 45ec41ea299eab5085f87c5c2a1d28245bc22f21 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh@NetBSD.org>
Date: Sat, 5 Aug 2023 18:29:46 +0000
Subject: [PATCH] amd64: Fix ddb_ipi trapframe so `mach cpu' has a chance to
 work.

---
 sys/arch/amd64/amd64/vector.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S
index 99d18e153bfe..b9af3a2aeaf7 100644
--- a/sys/arch/amd64/amd64/vector.S
+++ b/sys/arch/amd64/amd64/vector.S
@@ -171,6 +171,7 @@ IDTVEC(handle_ddbipi)
 	movq	_C_LABEL(local_apic_va),%rbx
 	movl	$0,LAPIC_EOI(%rbx)
 	sti
+	movq	%rsp,%rdi
 	call	_C_LABEL(ddb_ipi)
 	xorl	%eax,%eax
 	movq	%rax,%cr8
@@ -184,6 +185,7 @@ IDTVEC(handle_x2apic_ddbipi)
 	xorl	%edx,%edx
 	wrmsr
 	sti
+	movq	%rsp,%rdi
 	call	_C_LABEL(ddb_ipi)
 	xorl	%eax,%eax
 	movq	%rax,%cr8