diff options
author | Roland Dreier <rolandd@cisco.com> | 2005-09-03 18:55:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:05:57 -0400 |
commit | 5a6a4d4320aed1918bf79dfb6bd841317f33b8e9 (patch) | |
tree | 6a66ffee8d8ff875cc07bc1cecd2b1f36df81c9a | |
parent | 656de7e46901fe3228b592e1d9fc89c353f0fa4e (diff) |
[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>
-rw-r--r-- | arch/ppc/mm/init.c | 5 | ||||
-rw-r--r-- | include/asm-ppc/kmap_types.h | 1 |
2 files changed, 4 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) | |||
560 | void flush_dcache_icache_page(struct page *page) | 560 | void flush_dcache_icache_page(struct page *page) |
561 | { | 561 | { |
562 | #ifdef CONFIG_BOOKE | 562 | #ifdef CONFIG_BOOKE |
563 | __flush_dcache_icache(kmap(page)); | 563 | void *start = kmap_atomic(page, KM_PPC_SYNC_ICACHE); |
564 | kunmap(page); | 564 | __flush_dcache_icache(start); |
565 | kunmap_atomic(start, KM_PPC_SYNC_ICACHE); | ||
565 | #elif CONFIG_8xx | 566 | #elif CONFIG_8xx |
566 | /* On 8xx there is no need to kmap since highmem is not supported */ | 567 | /* On 8xx there is no need to kmap since highmem is not supported */ |
567 | __flush_dcache_icache(page_address(page)); | 568 | __flush_dcache_icache(page_address(page)); |
diff --git a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h index 2589f182a6ad..6d6fc78731e5 100644 --- a/include/asm-ppc/kmap_types.h +++ b/include/asm-ppc/kmap_types.h | |||
@@ -17,6 +17,7 @@ enum km_type { | |||
17 | KM_SOFTIRQ0, | 17 | KM_SOFTIRQ0, |
18 | KM_SOFTIRQ1, | 18 | KM_SOFTIRQ1, |
19 | KM_PPC_SYNC_PAGE, | 19 | KM_PPC_SYNC_PAGE, |
20 | KM_PPC_SYNC_ICACHE, | ||
20 | KM_TYPE_NR | 21 | KM_TYPE_NR |
21 | }; | 22 | }; |
22 | 23 | ||