diff options
Diffstat (limited to 'arch/arm64/kernel/entry.S')
-rw-r--r-- | arch/arm64/kernel/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 4db2bf6a0e84..9e3c33f56312 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -365,7 +365,7 @@ alternative_else_nop_endif add sp, sp, #S_FRAME_SIZE // restore sp #ifdef CONFIG_MRVL_ERRATUM_37119 -alternative_insn "tlbi aside1, xzr", "nop", ARM64_WORKAROUND_MRVL_37119 +alternative_insn nop, "tlbi aside1, xzr", ARM64_WORKAROUND_MRVL_37119 #endif .if \el == 0 alternative_insn eret, nop, ARM64_UNMAP_KERNEL_AT_EL0 @@ -778,6 +778,7 @@ el0_sync_compat: b.ge el0_dbg b el0_inv el0_svc_compat: + gic_prio_kentry_setup tmp=x1 mov x0, sp bl el0_svc_compat_handler b ret_to_user |