From e0e26b99b6f649056dd3d86abb41ecf44e41f9a5 Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@cvs.openbsd.org>
Date: Sun, 2 Feb 2020 18:01:40 +0000
Subject: Back out previous "insert two nop instructions after svc instructions
 for SYS_exit and SYS_sigreturn in the sigtramp"; init has trouble spawning
 processes.

---
 sys/arch/arm64/arm64/locore.S | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sys/arch/arm64/arm64/locore.S b/sys/arch/arm64/arm64/locore.S
index 01917a3de82..1b6e90dfe06 100644
--- a/sys/arch/arm64/arm64/locore.S
+++ b/sys/arch/arm64/arm64/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.26 2020/02/01 23:09:46 deraadt Exp $ */
+/* $OpenBSD: locore.S,v 1.27 2020/02/02 18:01:39 naddy Exp $ */
 /*-
  * Copyright (c) 2012-2014 Andrew Turner
  * All rights reserved.
@@ -347,16 +347,12 @@ _C_LABEL(sigcode):
 1:
 	mov	x8, #SYS_sigreturn
 	svc	0
-	nop
-	nop
 	.globl  _C_LABEL(sigcoderet)
 _C_LABEL(sigcoderet):
 
 	/* sigreturn failed, exit */
 	mov	x8, #SYS_exit
 	svc	0
-	nop
-	nop
 
 	b	1b
 END(sigcode)
-- 
cgit v1.2.3