From f05a5be590ae0b5b20b97d23ee67d7a38fbd38d8 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 31 Aug 2015 09:39:16 +0000
Subject: [PATCH] Clean up the style of the LEAVE_HYP macro.

---
 sys/arm/arm/locore-v6.S | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S
index 7990f28ab4e7..5a5222877da9 100644
--- a/sys/arm/arm/locore-v6.S
+++ b/sys/arm/arm/locore-v6.S
@@ -67,23 +67,23 @@ __FBSDID("$FreeBSD$");
 	.align	2
 
 #if __ARM_ARCH >= 7
-#define LEAVE_HYP							\
-       /* Leave HYP mode */						;\
-       mrs	r0, cpsr		   				;\
-       and	r0, r0, #(PSR_MODE)     /* Mode is in the low 5 bits of CPSR */	;\
-       teq	r0, #(PSR_HYP32_MODE)   /* Hyp Mode? */			;\
-       bne	1f							;\
-       /* Ensure that IRQ, FIQ and Aborts will be disabled after eret */;\
-       mrs	r0, spsr						;\
-       orr	r0, r0, #(PSR_I | PSR_F | PSR_A)			;\
-       msr	spsr, r0						;\
-       /* Exit hypervisor mode */					;\
-       adr	lr, 1f							;\
-       MSR_ELR_HYP(14)							;\
-       ERET								;\
+#define	LEAVE_HYP							\
+	/* Leave HYP mode */						;\
+	mrs	r0, cpsr						;\
+	and	r0, r0, #(PSR_MODE)   /* Mode is in the low 5 bits of CPSR */ ;\
+	teq	r0, #(PSR_HYP32_MODE) /* Hyp Mode? */			;\
+	bne	1f							;\
+	/* Ensure that IRQ, FIQ and Aborts will be disabled after eret */ ;\
+	mrs	r0, spsr						;\
+	orr	r0, r0, #(PSR_I | PSR_F | PSR_A)			;\
+	msr	spsr, r0						;\
+	/* Exit hypervisor mode */					;\
+	adr	lr, 1f							;\
+	MSR_ELR_HYP(14)							;\
+	ERET								;\
 1:
 #else
-#define LEAVE_HYP
+#define	LEAVE_HYP
 #endif /* __ARM_ARCH >= 7 */
 
 /*