diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2009-11-24 18:54:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 14:58:50 +0000 |
| commit | 115b22474eb1905da2f606a057da3455833333d3 (patch) | |
| tree | 21633ac227c92fc6f646ccdb5a0b3d7f5f73aaba /arch | |
| parent | f91fb05d826a43063fa0aa2ec30c23d3993a208d (diff) | |
| download | linux-stable-115b22474eb1905da2f606a057da3455833333d3.tar.gz linux-stable-115b22474eb1905da2f606a057da3455833333d3.tar.bz2 linux-stable-115b22474eb1905da2f606a057da3455833333d3.zip | |
ARM: 5794/1: Flush the D-cache during copy_user_highpage()
The I and D caches for copy-on-write pages on processors with
write-allocate caches become incoherent causing problems on application
relying on CoW for text pages (dynamic linker relocating symbols in a
text page). This patch flushes the D-cache for such pages.
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/copypage-v6.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c index 4127a7bddfe5..841f355319bf 100644 --- a/arch/arm/mm/copypage-v6.c +++ b/arch/arm/mm/copypage-v6.c @@ -41,6 +41,14 @@ static void v6_copy_user_highpage_nonaliasing(struct page *to, kfrom = kmap_atomic(from, KM_USER0); kto = kmap_atomic(to, KM_USER1); copy_page(kto, kfrom); +#ifdef CONFIG_HIGHMEM + /* + * kmap_atomic() doesn't set the page virtual address, and + * kunmap_atomic() takes care of cache flushing already. + */ + if (page_address(to) != NULL) +#endif + __cpuc_flush_dcache_page(kto); kunmap_atomic(kto, KM_USER1); kunmap_atomic(kfrom, KM_USER0); } |