mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-20 14:16:02 +00:00
[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>
This commit is contained in:
parent
656de7e469
commit
5a6a4d4320
2 changed files with 4 additions and 2 deletions
|
@ -560,8 +560,9 @@ void flush_dcache_page(struct page *page)
|
||||||
void flush_dcache_icache_page(struct page *page)
|
void flush_dcache_icache_page(struct page *page)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_BOOKE
|
#ifdef CONFIG_BOOKE
|
||||||
__flush_dcache_icache(kmap(page));
|
void *start = kmap_atomic(page, KM_PPC_SYNC_ICACHE);
|
||||||
kunmap(page);
|
__flush_dcache_icache(start);
|
||||||
|
kunmap_atomic(start, KM_PPC_SYNC_ICACHE);
|
||||||
#elif CONFIG_8xx
|
#elif CONFIG_8xx
|
||||||
/* On 8xx there is no need to kmap since highmem is not supported */
|
/* On 8xx there is no need to kmap since highmem is not supported */
|
||||||
__flush_dcache_icache(page_address(page));
|
__flush_dcache_icache(page_address(page));
|
||||||
|
|
|
@ -17,6 +17,7 @@ enum km_type {
|
||||||
KM_SOFTIRQ0,
|
KM_SOFTIRQ0,
|
||||||
KM_SOFTIRQ1,
|
KM_SOFTIRQ1,
|
||||||
KM_PPC_SYNC_PAGE,
|
KM_PPC_SYNC_PAGE,
|
||||||
|
KM_PPC_SYNC_ICACHE,
|
||||||
KM_TYPE_NR
|
KM_TYPE_NR
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue