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://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
flush.c
diff --git
a/arch/arm/mm/flush.c
b/arch/arm/mm/flush.c
index
2b269c9
..
1a8d4aa
100644
(file)
--- a/
arch/arm/mm/flush.c
+++ b/
arch/arm/mm/flush.c
@@
-253,8
+253,8
@@
void __sync_icache_dcache(pte_t pteval)
if (!test_and_set_bit(PG_dcache_clean, &page->flags))
__flush_dcache_page(mapping, page);
if (!test_and_set_bit(PG_dcache_clean, &page->flags))
__flush_dcache_page(mapping, page);
- /* pte_exec() already checked above for non-aliasing VIPT cache */
- if (
cache_is_vipt_nonaliasing() ||
pte_exec(pteval))
+
+ if (pte_exec(pteval))
__flush_icache_all();
}
#endif
__flush_icache_all();
}
#endif
@@
-275,7
+275,8
@@
void __sync_icache_dcache(pte_t pteval)
* kernel cache lines for later. Otherwise, we assume we have
* aliasing mappings.
*
* kernel cache lines for later. Otherwise, we assume we have
* aliasing mappings.
*
- * Note that we disable the lazy flush for SMP.
+ * Note that we disable the lazy flush for SMP configurations where
+ * the cache maintenance operations are not automatically broadcasted.
*/
void flush_dcache_page(struct page *page)
{
*/
void flush_dcache_page(struct page *page)
{