diff --git a/[refs] b/[refs] index b186487a6c8f..c36ba4690836 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7cc2c59cc83558fc26f17eee3c8f901119f0a7c +refs/heads/master: a71ebdfa5243765e455a9ec2d6360e1704c6599e diff --git a/trunk/arch/arm/mm/flush.c b/trunk/arch/arm/mm/flush.c index 1efb05c64db3..454205b789d5 100644 --- a/trunk/arch/arm/mm/flush.c +++ b/trunk/arch/arm/mm/flush.c @@ -107,7 +107,7 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, /* VIPT non-aliasing cache */ if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask) && - vma->vm_flags | VM_EXEC) { + vma->vm_flags & VM_EXEC) { unsigned long addr = (unsigned long)kaddr; /* only flushing the kernel mapping on non-aliasing VIPT */ __cpuc_coherent_kern_range(addr, addr + len);