diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-27 21:43:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-27 21:43:17 +0300 |
| commit | 1d68101367a92336e633d0c3681bf8c86644e124 (patch) | |
| tree | 8fdacef561481c25c71641b8fa91a5dfa0ba7f96 /arch/s390/include | |
| parent | 085c4c7dd2b6558fb079fad07d6e9064f5e0b4c2 (diff) | |
| parent | 1fc7f56db7a7c467e46a5d2e2a009d2f337e0338 (diff) | |
| download | linux-1d68101367a92336e633d0c3681bf8c86644e124.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/mmu_context.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h index ccbb53e22024..8d04e6f3f796 100644 --- a/arch/s390/include/asm/mmu_context.h +++ b/arch/s390/include/asm/mmu_context.h @@ -25,7 +25,7 @@ static inline int init_new_context(struct task_struct *tsk, atomic_set(&mm->context.flush_count, 0); mm->context.gmap_asce = 0; mm->context.flush_mm = 0; - mm->context.compat_mm = 0; + mm->context.compat_mm = test_thread_flag(TIF_31BIT); #ifdef CONFIG_PGSTE mm->context.alloc_pgste = page_table_allocate_pgste || test_thread_flag(TIF_PGSTE) || @@ -90,8 +90,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, { int cpu = smp_processor_id(); - if (prev == next) - return; S390_lowcore.user_asce = next->context.asce; cpumask_set_cpu(cpu, &next->context.cpu_attach_mask); /* Clear previous user-ASCE from CR1 and CR7 */ @@ -103,7 +101,8 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, __ctl_load(S390_lowcore.vdso_asce, 7, 7); clear_cpu_flag(CIF_ASCE_SECONDARY); } - cpumask_clear_cpu(cpu, &prev->context.cpu_attach_mask); + if (prev != next) + cpumask_clear_cpu(cpu, &prev->context.cpu_attach_mask); } #define finish_arch_post_lock_switch finish_arch_post_lock_switch |