git: 136b8bd610c5 - main - arm64: use PSR_DAIF instead of each individual flag

From: Christos Margiolis <christos_at_FreeBSD.org>
Date: Mon, 22 May 2023 19:50:11 UTC
The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=136b8bd610c5e5e3e3c4cf0491523fb35733d2df

commit 136b8bd610c5e5e3e3c4cf0491523fb35733d2df
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-05-22 19:49:33 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2023-05-22 19:49:33 +0000

    arm64: use PSR_DAIF instead of each individual flag
    
    No functional change intended.
    
    Reviewed by:    mhorne, andrew
    Approved by:    markj (mentor)
    Differential Revision:  https://reviews.freebsd.org/D40165
---
 sys/arm64/arm64/locore.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index e26003b6c926..79affe82a434 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -321,7 +321,7 @@ LENTRY(drop_to_el1)
 	/* Zero vttbr_el2 so a hypervisor can tell the host and guest apart */
 	msr	vttbr_el2, xzr
 
-	mov	x2, #(PSR_F | PSR_I | PSR_A | PSR_D | PSR_M_EL1h)
+	mov	x2, #(PSR_DAIF | PSR_M_EL1h)
 	msr	spsr_el2, x2
 
 	/* Configure GICv3 CPU interface */