From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 25 Oct 2009 13:35:13 +0000 (+0000)
Subject: ARM: I-cache: Add invalidation for VIVT ASID tagged caches
X-Git-Tag: Ubuntu-5.10.0-12.13~30458^2~5^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9e95922b1016ac941db7edcf6b6088b3c2e916c8;p=mirror_ubuntu-hirsute-kernel.git

ARM: I-cache: Add invalidation for VIVT ASID tagged caches

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index dc66f867bec4..9770e27dd581 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -69,6 +69,9 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned
 		    : "cc");
 		__flush_icache_all();
 	}
+
+	if (vma->vm_flags & VM_EXEC && icache_is_vivt_asid_tagged())
+		__flush_icache_all();
 }
 
 void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)
@@ -82,6 +85,9 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsig
 		flush_pfn_alias(pfn, user_addr);
 		__flush_icache_all();
 	}
+
+	if (vma->vm_flags & VM_EXEC && icache_is_vivt_asid_tagged())
+		__flush_icache_all();
 }
 
 void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,