From 253328ab5c47970f74d87f223102fb10401c69d5 Mon Sep 17 00:00:00 2001
From: mjg <mjg@FreeBSD.org>
Date: Thu, 20 Sep 2018 20:32:08 +0000
Subject: [PATCH] amd64: macroify copyin/copyout and provide erms variants,
 follow up

Fix a fat-fingered typo with a "funny" side-effect: when doing copyin on a
cpu without ERMS and with size being a multiply of 8 a page fault would be
triggered resulting in EFAULT.

Pointy hat: mjg
Approved by:	re (implicit)
---
 sys/amd64/amd64/support.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 168ea5b32bcf..043110226e22 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -410,7 +410,7 @@ copyout_fault:
 	movsq
 	movb	%al,%cl
 	andb	$7,%cl				/* copy remaining bytes */
-	je	1
+	je	1f
 .endif
 	rep
 	movsb