Merge "arm64: Move BP hardening to check_and_switch_context" (b337a530) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm64/mm/context.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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.
		@@ -202,7 +205,6 @@ switch_mm_fastpath:
		/* Errata workaround post TTBRx_EL1 update. */
		asmlinkage void post_ttbr_update_workaround(void)
		{
		arm64_apply_bp_hardening();
		}

		static int asids_init(void)