summaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@bell.net>2017-07-25 17:23:35 -0400
committerHelge Deller <deller@gmx.de>2017-07-25 23:36:54 +0200
commit56008c04ebc099940021b714da2d7779117cf6a7 (patch)
tree481921fdcfd0f2b964532baf1f7bd540809e3477 /arch/parisc
parentae7a609c34b6fb12328c553b5f9aab26ae74a28e (diff)
downloadlinux-56008c04ebc099940021b714da2d7779117cf6a7.tar.gz
linux-56008c04ebc099940021b714da2d7779117cf6a7.tar.bz2
linux-56008c04ebc099940021b714da2d7779117cf6a7.zip
parisc: Extend disabled preemption in copy_user_page
It's always bothered me that we only disable preemption in copy_user_page around the call to flush_dcache_page_asm. This patch extends this to after the copy. Signed-off-by: John David Anglin <dave.anglin@bell.net> Cc: stable@vger.kernel.org # 4.9+ Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/kernel/cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 3a64ebb39ac7..85a92db70afc 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -453,8 +453,8 @@ void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
before it can be accessed through the kernel mapping. */
preempt_disable();
flush_dcache_page_asm(__pa(vfrom), vaddr);
- preempt_enable();
copy_page_asm(vto, vfrom);
+ preempt_enable();
}
EXPORT_SYMBOL(copy_user_page);