From 572dfba45fb09653600fb971edc946675434346a Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Fri, 5 Jun 2015 19:36:28 +0000
Subject: [PATCH] And ... more discussion occurs between miod and kettenis
 about what register dance copyerr should do.....

---
 sys/arch/alpha/alpha/locore.s | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s
index 14ad2656bc6..6ecedc1f63b 100644
--- a/sys/arch/alpha/alpha/locore.s
+++ b/sys/arch/alpha/alpha/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.39 2015/06/05 18:36:07 deraadt Exp $ */
+/* $OpenBSD: locore.s,v 1.40 2015/06/05 19:36:28 deraadt Exp $ */
 /* $NetBSD: locore.s,v 1.94 2001/04/26 03:10:44 ross Exp $ */
 
 /*-
@@ -1061,7 +1061,8 @@ NESTED(copyout, 3, 16, ra, IM_RA|IM_S0, 0)
 LEAF(copyerr, 0)
 	LDGP(pv)
 	.set noat
-	ldq	at_reg, P_ADDR(at_reg)		/* clear handler.            */
+	ldq	at_reg, 0(s0)			/* kill the fault handler.   */
+	ldq	at_reg, P_ADDR(at_reg)
 	stq	zero, U_PCB_ONFAULT(at_reg)
 	.set at
 	ldq	ra, (16-8)(sp)			/* restore ra.		     */
-- 
2.20.1