Merge "arm64: kernel: fix __cpu_suspend mm switch on warm-boot" (2115da57) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

arch/arm64/kernel/suspend.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		#include <asm/debug-monitors.h>
		#include <asm/pgtable.h>
		#include <asm/memory.h>
		#include <asm/mmu_context.h>
		#include <asm/smp_plat.h>
		#include <asm/suspend.h>
		#include <asm/tlbflush.h>
		@@ -88,7 +89,18 @@ int cpu_suspend(unsigned long arg)
		*/
		ret = __cpu_suspend(arg);
		if (ret == 0) {
		/*
		* We are resuming from reset with TTBR0_EL1 set to the
		* idmap to enable the MMU; restore the active_mm mappings in
		* TTBR0_EL1 unless the active_mm == &init_mm, in which case
		* the thread entered __cpu_suspend with TTBR0_EL1 set to
		* reserved TTBR0 page tables and should be restored as such.
		*/
		if (mm == &init_mm)
		cpu_set_reserved_ttbr0();
		else
		cpu_switch_mm(mm->pgd, mm);

		flush_tlb_all();

		/*