diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-18 13:06:49 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-18 13:06:49 +0800 |
| commit | 142e6be5c40648bebe5267c6470966b6ba8f0e8b (patch) | |
| tree | 1182e7b1b64285af880bb1084b61b39ef5246d7d /arch/arm64/include | |
| parent | 87449e82dffbc547b20ea133bf2d8fc767096e56 (diff) | |
| parent | 667ea3959654ae48ef303df13f2635fd07766cb4 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Conflicts:
arch/x86/syscalls/syscall_64.tbl
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/mmu_context.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index a9eee33dfa62..101a42bde728 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -151,6 +151,15 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, { unsigned int cpu = smp_processor_id(); + /* + * init_mm.pgd does not contain any user mappings and it is always + * active for kernel addresses in TTBR1. Just set the reserved TTBR0. + */ + if (next == &init_mm) { + cpu_set_reserved_ttbr0(); + return; + } + if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) || prev != next) check_and_switch_context(next, tsk); } |