Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

[platform/kernel/linux-rpi.git] / arch / arm64 / kernel / armv8_deprecated.c

diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
index 39dc98d..9d3442d 100644 (file)
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@ -185,10 +185,15 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops)
 
        switch (ops->status) {
        case INSN_DEPRECATED:
+#if 0
                insn->current_mode = INSN_EMULATE;
                /* Disable the HW mode if it was turned on at early boot time */
                run_all_cpu_set_hw_mode(insn, false);
+#else
+               insn->current_mode = INSN_HW;
+               run_all_cpu_set_hw_mode(insn, true);
                insn->max = INSN_HW;
+#endif
                break;
        case INSN_OBSOLETE:
                insn->current_mode = INSN_UNDEF;