svn commit: r347485 - stable/12/sys/arm64/arm64

[Konstantin Belousov]

Author: kib
Date: Sat May 11 09:12:13 2019
New Revision: 347485
URL: https://svnweb.freebsd.org/changeset/base/347485

Log:
  MFC r347133:
  arm64: Properly restore PAN when done with userspace access in casueword.

Modified:
  stable/12/sys/arm64/arm64/support.S
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm64/arm64/support.S
==============================================================================
--- stable/12/sys/arm64/arm64/support.S	Sat May 11 09:09:10 2019	(r347484)
+++ stable/12/sys/arm64/arm64/support.S	Sat May 11 09:12:13 2019	(r347485)
@@ -64,8 +64,8 @@ ENTRY(casueword32)
 	b.ne	2f			/* Not equal, exit */
 	stxr	w5, w3, [x0]		/* Store the new data */
 	cbnz	w5, 1b			/* Retry on failure */
-	EXIT_USER_ACCESS(w6)
-2:	SET_FAULT_HANDLER(xzr, x5)	/* Reset the fault handler */
+2:	EXIT_USER_ACCESS(w6)
+	SET_FAULT_HANDLER(xzr, x5)	/* Reset the fault handler */
 	str	w4, [x2]		/* Store the read data */
 	mov	x0, #0			/* Success */
 	ret				/* Return */
@@ -86,8 +86,8 @@ ENTRY(casueword)
 	b.ne	2f			/* Not equal, exit */
 	stxr	w5, x3, [x0]		/* Store the new data */
 	cbnz	w5, 1b			/* Retry on failure */
-	EXIT_USER_ACCESS(w6)
-2:	SET_FAULT_HANDLER(xzr, x5)	/* Reset the fault handler */
+2:	EXIT_USER_ACCESS(w6)
+	SET_FAULT_HANDLER(xzr, x5)	/* Reset the fault handler */
 	str	x4, [x2]		/* Store the read data */
 	mov	x0, #0			/* Success */
 	ret				/* Return */