Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Roland Dreier and committed by
Linus Torvalds
5a6a4d43 656de7e4

+4 -2
+3 -2
arch/ppc/mm/init.c
··· 560 560 void flush_dcache_icache_page(struct page *page) 561 561 { 562 562 #ifdef CONFIG_BOOKE 563 - __flush_dcache_icache(kmap(page)); 564 - kunmap(page); 563 + void *start = kmap_atomic(page, KM_PPC_SYNC_ICACHE); 564 + __flush_dcache_icache(start); 565 + kunmap_atomic(start, KM_PPC_SYNC_ICACHE); 565 566 #elif CONFIG_8xx 566 567 /* On 8xx there is no need to kmap since highmem is not supported */ 567 568 __flush_dcache_icache(page_address(page));
+1
include/asm-ppc/kmap_types.h
··· 17 17 KM_SOFTIRQ0, 18 18 KM_SOFTIRQ1, 19 19 KM_PPC_SYNC_PAGE, 20 + KM_PPC_SYNC_ICACHE, 20 21 KM_TYPE_NR 21 22 }; 22 23