Skip to content

Commit

Permalink
[PATCH] ppc32: Don't sleep in flush_dcache_icache_page()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Roland Dreier authored and Linus Torvalds committed Sep 5, 2005
1 parent 656de7e commit 5a6a4d4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/ppc/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 1 addition & 0 deletions include/asm-ppc/kmap_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
KM_PPC_SYNC_ICACHE,
KM_TYPE_NR
};

Expand Down

0 comments on commit 5a6a4d4

Please sign in to comment.