summaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-11-03 21:02:39 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-03 21:02:39 +0000
commit5f8b1178e246422ebddc1b16487314c91edf85fe (patch)
tree67b0b09acc80bfc1ca81f92cdad45ca156706bea /include/asm-arm
parent24bcc2f46cf8982dbc02c8e3037dfc5e12f1e35c (diff)
parent7e5e6e9a509c4ed2973a345ec7ffb96577f42e26 (diff)
[ARM] Merge SMP tree
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/mmu_context.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/mmu_context.h b/include/asm-arm/mmu_context.h
index 4af9c411c61..57b8def83d4 100644
--- a/include/asm-arm/mmu_context.h
+++ b/include/asm-arm/mmu_context.h
@@ -86,7 +86,8 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
cpu_set(cpu, next->cpu_vm_mask);
check_context(next);
cpu_switch_mm(next->pgd, next);
- cpu_clear(cpu, prev->cpu_vm_mask);
+ if (cache_is_vivt())
+ cpu_clear(cpu, prev->cpu_vm_mask);
}
}