diff options
| author | George G. Davis <davis_g@mvista.com> | 2006-09-21 03:57:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-25 10:34:04 +0100 |
| commit | a71ebdfa5243765e455a9ec2d6360e1704c6599e (patch) | |
| tree | 07685ddb0d4a8f3b1872b73be5d6fda724a6dc9e | |
| parent | e7cc2c59cc83558fc26f17eee3c8f901119f0a7c (diff) | |
| download | kernel-crypto-a71ebdfa5243765e455a9ec2d6360e1704c6599e.tar.gz kernel-crypto-a71ebdfa5243765e455a9ec2d6360e1704c6599e.tar.xz kernel-crypto-a71ebdfa5243765e455a9ec2d6360e1704c6599e.zip | |
[ARM] 3853/1: Fix flush_ptrace_access() thinko for nonaliasing VIPT cache case
Fix thinko in the flush_ptrace_access() "if (expr)" for the ARM
VIPT non-aliasing cache case. We only need to flush cache when
VM_EXEC is set in vma->vm_flags but "if (expr) always evaluates
to true on UP systems for the ARM VIPT non-aliasing cache case.
Signed-off-by: George G. Davis <gdavis@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mm/flush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 1efb05c64db..454205b789d 100644 --- a/arch/arm/mm/flush.c +++ b/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); |