From 9727ca6a77dc224c2f9c19b057f2416df6e15833 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 29 Jul 2010 16:49:20 +0000
Subject: [PATCH] Fix another fallout from r208833.  savectx() is used to save
 CPU context for crash dump (dumppcb) and kdb (stoppcbs).  For both cases,
 there cannot have a valid pointer in pcb_save.  This should restore the
 previous behaviour.

---
 sys/amd64/amd64/cpu_switch.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index f3cfff3512a..0ffc5678a2f 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -347,7 +347,7 @@ ENTRY(savectx)
 	lmsw	%ax
 
 	movq	$PCB_SAVEFPU_SIZE,%rdx	/* arg 3 */
-	movq	PCB_SAVEFPU(%rcx),%rsi	/* arg 2 */
+	leaq	PCB_USERFPU(%rcx),%rsi	/* arg 2 */
 	/* arg 1 (%rdi) already loaded */
 	call	bcopy
 1: