Commit b15d53d0 authored by David Hildenbrand's avatar David Hildenbrand Committed by Rich Felker

sched/preempt, sh: kmap_coherent relies on disabled preemption

kmap_coherent needs disabled preemption to not schedule in the critical
section, just like kmap_coherent on mips and kmap_atomic in general.

Fixes: 8222dbe2 "sched/preempt, mm/fault: Decouple preemption from the page fault logic"
Reported-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Tested-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent 044b81f8
...@@ -36,6 +36,7 @@ void *kmap_coherent(struct page *page, unsigned long addr) ...@@ -36,6 +36,7 @@ void *kmap_coherent(struct page *page, unsigned long addr)
BUG_ON(!test_bit(PG_dcache_clean, &page->flags)); BUG_ON(!test_bit(PG_dcache_clean, &page->flags));
preempt_disable();
pagefault_disable(); pagefault_disable();
idx = FIX_CMAP_END - idx = FIX_CMAP_END -
...@@ -64,4 +65,5 @@ void kunmap_coherent(void *kvaddr) ...@@ -64,4 +65,5 @@ void kunmap_coherent(void *kvaddr)
} }
pagefault_enable(); pagefault_enable();
preempt_enable();
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment