Merge branch 'for-next/mops' into for-next/core

[linux.git] / arch / arm64 / kernel / traps.c

diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index fdbcf047108cfba9b555318dd982e25ba38566d2..ee318f6df647ff3fd432bb92eaee0c850d7840ab 100644 (file)
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -541,6 +541,13 @@ void do_el0_mops(struct pt_regs *regs, unsigned long esr)
        user_fastforward_single_step(current);
 }
 
+void do_el1_mops(struct pt_regs *regs, unsigned long esr)
+{
+       arm64_mops_reset_regs(&regs->user_regs, esr);
+
+       kernel_fastforward_single_step(regs);
+}
+
 #define __user_cache_maint(insn, address, res)                 \
        if (address >= TASK_SIZE_MAX) {                         \
                res = -EFAULT;                                  \