Merge branch 'for-next/bti-user' into for-next/bti

[thirdparty/linux.git] / arch / arm64 / kernel / entry-common.c

diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index 55ec0627f5a7363857012cf1b1fd17f7f7cbb101..1196eb4f4c762a1225ff300fa99229bcf5b88e59 100644 (file)
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@ -175,7 +175,7 @@ NOKPROBE_SYMBOL(el0_pc);
 static void notrace el0_sp(struct pt_regs *regs, unsigned long esr)
 {
        user_exit_irqoff();
-       local_daif_restore(DAIF_PROCCTX_NOIRQ);
+       local_daif_restore(DAIF_PROCCTX);
        do_sp_pc_abort(regs->sp, esr, regs);
 }
 NOKPROBE_SYMBOL(el0_sp);