evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xtensa: fix preemption in {clear,copy}_user_highpage

Browse source 
commit a67cc9aa2dfc6e66addf240bbd79e16e01565e81 upstream.

Disabling pagefault makes little sense there, preemption disabling is
what was meant.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Max Filippov 2016-02-25 23:27:51 +03:00 • committed by Greg Kroah-Hartman
parent f2e1e0a0af
commit cd8af682db
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/xtensa/mm/cache.c
View file

@ -97,11 +97,11 @@ void clear_user_highpage(struct page *page, unsigned long vaddr)
unsigned long paddr; unsigned long paddr;
void *kvaddr = coherent_kvaddr(page, TLBTEMP_BASE_1, vaddr, &paddr); void *kvaddr = coherent_kvaddr(page, TLBTEMP_BASE_1, vaddr, &paddr);
pagefault_disable(); preempt_disable();
kmap_invalidate_coherent(page, vaddr); kmap_invalidate_coherent(page, vaddr);
set_bit(PG_arch_1, &page->flags); set_bit(PG_arch_1, &page->flags);
clear_page_alias(kvaddr, paddr); clear_page_alias(kvaddr, paddr);
pagefault_enable(); preempt_enable();
} }
void copy_user_highpage(struct page *dst, struct page *src, void copy_user_highpage(struct page *dst, struct page *src,
@ -113,11 +113,11 @@ void copy_user_highpage(struct page *dst, struct page *src,
void *src_vaddr = coherent_kvaddr(src, TLBTEMP_BASE_2, vaddr, void *src_vaddr = coherent_kvaddr(src, TLBTEMP_BASE_2, vaddr,
&src_paddr); &src_paddr);
pagefault_disable(); preempt_disable();
kmap_invalidate_coherent(dst, vaddr); kmap_invalidate_coherent(dst, vaddr);
set_bit(PG_arch_1, &dst->flags); set_bit(PG_arch_1, &dst->flags);
copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr); copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr);
pagefault_enable(); preempt_enable();
} }
#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ #endif /* DCACHE_WAY_SIZE > PAGE_SIZE */