Merge android-4.4-p.197 (93ec8fb) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm64 / mm / context.c

diff --git a/arch/arm64/mm/context.c b/arch/arm64/mm/context.c
index d4bf895..1e31cd3 100644 (file)
--- a/arch/arm64/mm/context.c
+++ b/arch/arm64/mm/context.c
@@ -191,6 +191,9 @@ void check_and_switch_context(struct mm_struct *mm, unsigned int cpu)
        raw_spin_unlock_irqrestore(&cpu_asid_lock, flags);
 
 switch_mm_fastpath:
+
+       arm64_apply_bp_hardening();
+
        /*
         * Defer TTBR0_EL1 setting for user threads to uaccess_enable() when
         * emulating PAN.