From 8373dc38ca8d4918210710807256a313cd111f0b Mon Sep 17 00:00:00 2001 From: saeed bishara Date: Mon, 16 May 2011 15:41:15 +0100 Subject: ARM: 6901/1: remove unneeded check of the cache_is_vipt_nonaliasing() when cache_is_vipt_nonaliasing(), we always have pte_exec() true at the end of this function, so no need for the additional check. Acked-by: Catalin Marinas Signed-off-by: Saeed Bishara Signed-off-by: Russell King --- arch/arm/mm/flush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mm/flush.c') diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 2b269c955524..f1b799802858 100644 --- 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); - /* 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 -- cgit v1.2.3-59-g8ed1b From 31bee4cf0e74e9c962d481a68452debaf45ed4ac Mon Sep 17 00:00:00 2001 From: saeed bishara Date: Mon, 16 May 2011 11:25:21 +0100 Subject: ARM: 6899/1: fix the note about dcache lazy flushing for SMP systems Acked-by: Catalin Marinas Signed-off-by: Saeed Bishara Signed-off-by: Russell King --- arch/arm/mm/flush.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mm/flush.c') diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 2b269c955524..b7f69800348f 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c @@ -275,7 +275,8 @@ void __sync_icache_dcache(pte_t pteval) * 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) { -- cgit v1.2.3-59-g8ed1b