From owner-svn-src-all@freebsd.org  Mon Aug 31 09:39:17 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 295EE9C617D;
 Mon, 31 Aug 2015 09:39:17 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1A0561257;
 Mon, 31 Aug 2015 09:39:17 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7V9dGX0078644;
 Mon, 31 Aug 2015 09:39:16 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7V9dGjo078643;
 Mon, 31 Aug 2015 09:39:16 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201508310939.t7V9dGjo078643@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 31 Aug 2015 09:39:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287322 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Aug 2015 09:39:17 -0000

Author: andrew
Date: Mon Aug 31 09:39:16 2015
New Revision: 287322
URL: https://svnweb.freebsd.org/changeset/base/287322

Log:
  Clean up the style of the LEAVE_HYP macro.

Modified:
  head/sys/arm/arm/locore-v6.S

Modified: head/sys/arm/arm/locore-v6.S
==============================================================================
--- head/sys/arm/arm/locore-v6.S	Mon Aug 31 07:18:13 2015	(r287321)
+++ head/sys/arm/arm/locore-v6.S	Mon Aug 31 09:39:16 2015	(r287322)
@@ -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 */
 
 /*