---

yaml --- r: 36611 b: refs/heads/master c: a71ebdf h: refs/heads/master i: 36609: adec3e5 36607: 5f6cd71 v: v3
git-mirror · Sep 25, 2006 · c1eb94d · c1eb94d
1 parent 5b0b967
commit c1eb94d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);