From 37563d39efd115c7e6ccddb5f2dc1e0d089b2b8b Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 15 Feb 2024 16:13:09 +0000
Subject: [PATCH] arm64: Use the new CurrentEL macros

Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D43972
---
 sys/arm64/arm64/locore.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index b246ed3f2a4..638c4a54289 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -267,8 +267,8 @@ END(mpentry)
  */
 LENTRY(drop_to_el1)
 	mrs	x23, CurrentEL
-	lsr	x23, x23, #2
-	cmp	x23, #0x2
+	and	x23, x23, #(CURRENTEL_EL_MASK)
+	cmp	x23, #(CURRENTEL_EL_EL2)
 	b.eq	1f
 	ret
 1: