diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 12:06:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 12:06:42 +1000 |
| commit | 50f6ac54d43e4b626a33ac4577d9b4614b9601c2 (patch) | |
| tree | b07153507e62055da69b79394b532eb6d29ac896 /arch/arm/include/asm/mmu_context.h | |
| parent | 4c5a42519abb67df3bb547400957491e6e612fe6 (diff) | |
| parent | 1e8c3fdac4486ee8dbc67e89df34328be1b724b3 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
kernel/cpu.c
Diffstat (limited to 'arch/arm/include/asm/mmu_context.h')
| -rw-r--r-- | arch/arm/include/asm/mmu_context.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h index 263fed05ea33..c3fe09f8fd77 100644 --- a/arch/arm/include/asm/mmu_context.h +++ b/arch/arm/include/asm/mmu_context.h @@ -101,14 +101,15 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, #ifdef CONFIG_SMP /* check for possible thread migration */ - if (!cpus_empty(next->cpu_vm_mask) && !cpu_isset(cpu, next->cpu_vm_mask)) + if (!cpumask_empty(mm_cpumask(next)) && + !cpumask_test_cpu(cpu, mm_cpumask(next))) __flush_icache_all(); #endif - if (!cpu_test_and_set(cpu, next->cpu_vm_mask) || prev != next) { + if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) || prev != next) { check_context(next); cpu_switch_mm(next->pgd, next); if (cache_is_vivt()) - cpu_clear(cpu, prev->cpu_vm_mask); + cpumask_clear_cpu(cpu, mm_cpumask(prev)); } #endif } |