diff options
| author | Rohit Khanna <rokhanna@nvidia.com> | 2016-09-07 13:00:23 -0700 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2016-09-27 11:54:46 -0700 |
| commit | e0197788da51e95824f6d83f9ef12db9e8266168 (patch) | |
| tree | c12756631f8178c5e5f5344330bf60a1a2f51cd6 /arch | |
| parent | 60f51c7e8069154598533f9f3c5c2e6b3991cfe3 (diff) | |
Revert "arm64:mm: rm swtch to ASID0 in ctxt swtch"
This reverts commit 584b60200b8bdcc895c8edacb94f48db5929f70a.
Change-Id: Ibe5b217521b77fa5799400b9460182e3329e1779
Signed-off-by: Rohit Khanna <rokhanna@nvidia.com>
Reviewed-on: http://git-master/r/1216501
(cherry picked from commit 04c8d66d61e15198b95d54672b2f2fe047d180b3)
Reviewed-on: http://git-master/r/1223596
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Tested-by: Bibek Basu <bbasu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/mmu_context.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index 04586a88487b..237635d8a46f 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -78,8 +78,11 @@ static inline void switch_new_context(struct mm_struct *mm) static inline void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk) { - /* unneeded switch to ASID0 */ - /* cpu_set_reserved_ttbr0(); */ + /* + * Required during context switch to avoid speculative page table + * walking with the wrong TTBR. + */ + cpu_set_reserved_ttbr0(); if (!((mm->context.id ^ cpu_last_asid) >> max_asid_bits)) /* |