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 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
fault-armv.c
diff --git
a/arch/arm/mm/fault-armv.c
b/arch/arm/mm/fault-armv.c
index
0d414c2
..
9b906de
100644
(file)
--- a/
arch/arm/mm/fault-armv.c
+++ b/
arch/arm/mm/fault-armv.c
@@
-134,8
+134,6
@@
make_coherent(struct address_space *mapping, struct vm_area_struct *vma,
flush_dcache_mmap_unlock(mapping);
if (aliases)
do_adjust_pte(vma, addr, pfn, ptep);
flush_dcache_mmap_unlock(mapping);
if (aliases)
do_adjust_pte(vma, addr, pfn, ptep);
- else
- flush_cache_page(vma, addr, pfn);
}
/*
}
/*