git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
tlbflush.h
diff --git
a/arch/arm/include/asm/tlbflush.h
b/arch/arm/include/asm/tlbflush.h
index
c964f3f
..
a45ab5d
100644
(file)
--- a/
arch/arm/include/asm/tlbflush.h
+++ b/
arch/arm/include/asm/tlbflush.h
@@
-350,7
+350,7
@@
static inline void local_flush_tlb_mm(struct mm_struct *mm)
if (tlb_flag(TLB_WB))
dsb();
if (tlb_flag(TLB_WB))
dsb();
- if (cpu
_isset(smp_processor_id(), mm->cpu_vm_mask
)) {
+ if (cpu
mask_test_cpu(smp_processor_id(), mm_cpumask(mm)
)) {
if (tlb_flag(TLB_V3_FULL))
asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (zero) : "cc");
if (tlb_flag(TLB_V4_U_FULL))
if (tlb_flag(TLB_V3_FULL))
asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (zero) : "cc");
if (tlb_flag(TLB_V4_U_FULL))
@@
-388,7
+388,7
@@
local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
if (tlb_flag(TLB_WB))
dsb();
if (tlb_flag(TLB_WB))
dsb();
- if (cpu
_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask
)) {
+ if (cpu
mask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)
)) {
if (tlb_flag(TLB_V3_PAGE))
asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (uaddr) : "cc");
if (tlb_flag(TLB_V4_U_PAGE))
if (tlb_flag(TLB_V3_PAGE))
asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (uaddr) : "cc");
if (tlb_flag(TLB_V4_U_PAGE))