svn commit: r339183 - head/sys/amd64/amd64

[Mateusz Guzik]

Author: mjg
Date: Thu Oct  4 20:01:48 2018
New Revision: 339183
URL: https://svnweb.freebsd.org/changeset/base/339183

Log:
  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

Modified:
  head/sys/amd64/amd64/support.S

Modified: head/sys/amd64/amd64/support.S
==============================================================================
--- head/sys/amd64/amd64/support.S	Thu Oct  4 19:54:47 2018	(r339182)
+++ head/sys/amd64/amd64/support.S	Thu Oct  4 20:01:48 2018	(r339183)
@@ -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