renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
Code

sched/preempt, sh: kmap_coherent relies on disabled preemption

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

Fixes: 8222dbe21e "sched/preempt, mm/fault: Decouple preemption from the page fault logic"
Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Tested-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Rich Felker <dalias@libc.org>
This commit is contained in:
David Hildenbrand 2016-02-29 09:19:24 +01:00 committed by Rich Felker
parent 044b81f872
commit b15d53d009
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/mm/kmap.c
View File

@ -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)
} }
pagefault_enable(); pagefault_enable();
preempt_enable();
} }