diff options
| author |   Max Filippov <jcmvbkbc@gmail.com> | 2016-02-25 23:27:51 +0300 |
|---|---|---|
| committer |   Chris Zankel <chris@zankel.net> | 2016-03-11 08:53:31 +0000 |
| commit | a67cc9aa2dfc6e66addf240bbd79e16e01565e81 (patch) | |
| tree | 0934b03ec3c974cbf43b75003e3a940f3c9f280f /arch/xtensa | |
| parent | xtensa: ISS: don't hang if stdin EOF is reached (diff) | |
| download | linux-dev-a67cc9aa2dfc6e66addf240bbd79e16e01565e81.tar.xz linux-dev-a67cc9aa2dfc6e66addf240bbd79e16e01565e81.zip | |
xtensa: fix preemption in {clear,copy}_user_highpage
Disabling pagefault makes little sense there, preemption disabling is
what was meant.
Cc: stable@vger.kernel.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/mm/cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c index d75aa1476da7..1a804a2f9a5b 100644 --- a/arch/xtensa/mm/cache.c +++ b/arch/xtensa/mm/cache.c @@ -97,11 +97,11 @@ void clear_user_highpage(struct page *page, unsigned long vaddr) unsigned long paddr; void *kvaddr = coherent_kvaddr(page, TLBTEMP_BASE_1, vaddr, &paddr); - pagefault_disable(); + preempt_disable(); kmap_invalidate_coherent(page, vaddr); set_bit(PG_arch_1, &page->flags); clear_page_alias(kvaddr, paddr); - pagefault_enable(); + preempt_enable(); } 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, &src_paddr); - pagefault_disable(); + preempt_disable(); kmap_invalidate_coherent(dst, vaddr); set_bit(PG_arch_1, &dst->flags); copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr); - pagefault_enable(); + preempt_enable(); } #endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ |