Kaynağa Gözat

[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>
Roland Dreier 19 yıl önce
ebeveyn
işleme
5a6a4d4320
2 değiştirilmiş dosya ile 4 ekleme ve 2 silme
  1. 3 2
      arch/ppc/mm/init.c
  2. 1 0
      include/asm-ppc/kmap_types.h

+ 3 - 2
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)); 

+ 1 - 0
include/asm-ppc/kmap_types.h

@@ -17,6 +17,7 @@ enum km_type {
 	KM_SOFTIRQ0,
 	KM_SOFTIRQ1,
 	KM_PPC_SYNC_PAGE,
+	KM_PPC_SYNC_ICACHE,
 	KM_TYPE_NR
 };