From 9657b80ce7682c0737d218e48389b54db1fe16a8 Mon Sep 17 00:00:00 2001
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Thu, 4 Oct 2018 20:01:48 +0000
Subject: [PATCH] amd64: hide non-erms jump label under non-erms copyin/copyout

This change is a no-op in terms of semantics, but has a side effect
of removing a perfectly useless nop sled for CPUs with ERMS.

Approved by:	re (gjb)
Sponsored by:   The FreeBSD Foundation
---
 sys/amd64/amd64/support.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 6fdb71cb9207..f0086e298ea5 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -457,9 +457,9 @@ END(fillw)
 	movq	%rax,PCB_ONFAULT(%r9)
 	POP_FRAME_POINTER
 	ret
-.endif
 	ALIGN_TEXT
 1:
+.endif
 	rep
 	movsb
 
@@ -525,9 +525,9 @@ END(copyout_smap_erms)
 	movq	%rax,PCB_ONFAULT(%r9)
 	POP_FRAME_POINTER
 	ret
-.endif
 	ALIGN_TEXT
 1:
+.endif
 	rep
 	movsb