aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2016-02-25 15:27:51 -0500
committerChris Zankel <chris@zankel.net>2016-03-11 03:53:31 -0500
commita67cc9aa2dfc6e66addf240bbd79e16e01565e81 (patch)
tree0934b03ec3c974cbf43b75003e3a940f3c9f280f
parent362014c8d9d51d504c167c44ac280169457732be (diff)
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>
-rw-r--r--arch/xtensa/mm/cache.c8
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)
97 unsigned long paddr; 97 unsigned long paddr;
98 void *kvaddr = coherent_kvaddr(page, TLBTEMP_BASE_1, vaddr, &paddr); 98 void *kvaddr = coherent_kvaddr(page, TLBTEMP_BASE_1, vaddr, &paddr);
99 99
100 pagefault_disable(); 100 preempt_disable();
101 kmap_invalidate_coherent(page, vaddr); 101 kmap_invalidate_coherent(page, vaddr);
102 set_bit(PG_arch_1, &page->flags); 102 set_bit(PG_arch_1, &page->flags);
103 clear_page_alias(kvaddr, paddr); 103 clear_page_alias(kvaddr, paddr);
104 pagefault_enable(); 104 preempt_enable();
105} 105}
106 106
107void copy_user_highpage(struct page *dst, struct page *src, 107void copy_user_highpage(struct page *dst, struct page *src,
@@ -113,11 +113,11 @@ void copy_user_highpage(struct page *dst, struct page *src,
113 void *src_vaddr = coherent_kvaddr(src, TLBTEMP_BASE_2, vaddr, 113 void *src_vaddr = coherent_kvaddr(src, TLBTEMP_BASE_2, vaddr,
114 &src_paddr); 114 &src_paddr);
115 115
116 pagefault_disable(); 116 preempt_disable();
117 kmap_invalidate_coherent(dst, vaddr); 117 kmap_invalidate_coherent(dst, vaddr);
118 set_bit(PG_arch_1, &dst->flags); 118 set_bit(PG_arch_1, &dst->flags);
119 copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr); 119 copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr);
120 pagefault_enable(); 120 preempt_enable();
121} 121}
122 122
123#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ 123#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */