From 7991717238d13d1b4649277826eaa50aca9397fd Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 1 Oct 2015 09:44:15 +0000
Subject: [PATCH] Add the ENTRY/END entries around the exception handlers.

Obtained from:	EuroBSDCon Devsummit
Sponsored by:	ABT Systems Ltd
---
 sys/arm64/arm64/exception.S | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S
index 2e6fee87e082..3dc484e33eed 100644
--- a/sys/arm64/arm64/exception.S
+++ b/sys/arm64/arm64/exception.S
@@ -131,45 +131,51 @@ __FBSDID("$FreeBSD$");
 2:
 .endm
 
-handle_el1h_sync:
+ENTRY(handle_el1h_sync)
 	save_registers 1
 	mov	x0, sp
 	bl	do_el1h_sync
 	restore_registers 1
 	eret
+END(handle_el1h_sync)
 
-handle_el1h_irq:
+ENTRY(handle_el1h_irq)
 	save_registers 1
 	mov	x0, sp
 	bl	arm_cpu_intr
 	restore_registers 1
 	eret
+END(handle_el1h_irq)
 
-handle_el1h_error:
+ENTRY(handle_el1h_error)
 	brk	0xf13
+END(handle_el1h_error)
 
-handle_el0_sync:
+ENTRY(handle_el0_sync)
 	save_registers 0
 	mov	x0, sp
 	bl	do_el0_sync
 	do_ast
 	restore_registers 0
 	eret
+END(handle_el0_sync)
 
-handle_el0_irq:
+ENTRY(handle_el0_irq)
 	save_registers 0
 	mov	x0, sp
 	bl	arm_cpu_intr
 	do_ast
 	restore_registers 0
 	eret
+END(handle_el0_irq)
 
-handle_el0_error:
+ENTRY(handle_el0_error)
 	save_registers 0
 	mov	x0, sp
 	bl	do_el0_error
 	brk	0xf23
 	1: b 1b
+END(handle_el0_error)
 
 .macro	vempty
 	.align 7