aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc/mm
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2005-09-03 15:55:43 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:05:57 -0700
commit5a6a4d4320aed1918bf79dfb6bd841317f33b8e9 (patch)
tree6a66ffee8d8ff875cc07bc1cecd2b1f36df81c9a /arch/ppc/mm
parent656de7e46901fe3228b592e1d9fc89c353f0fa4e (diff)
downloadlinux-linaro-stable-5a6a4d4320aed1918bf79dfb6bd841317f33b8e9.tar.gz
[PATCH] ppc32: Don't sleep in flush_dcache_icache_page()
flush_dcache_icache_page() will be called on an instruction page fault. We can't sleep in the fault handler, so use kmap_atomic() instead of just kmap() for the Book-E case. Signed-off-by: Roland Dreier <rolandd@cisco.com> Acked-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/mm')
-rw-r--r--arch/ppc/mm/init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 33ada72c7330..32ee49710267 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -560,8 +560,9 @@ void flush_dcache_page(struct page *page)
void flush_dcache_icache_page(struct page *page)
{
#ifdef CONFIG_BOOKE
- __flush_dcache_icache(kmap(page));
- kunmap(page);
+ void *start = kmap_atomic(page, KM_PPC_SYNC_ICACHE);
+ __flush_dcache_icache(start);
+ kunmap_atomic(start, KM_PPC_SYNC_ICACHE);
#elif CONFIG_8xx
/* On 8xx there is no need to kmap since highmem is not supported */
__flush_dcache_icache(page_address(page));