Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm64 / mm / flush.c

diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c
index 4dfa3975ce5befb8d68b716c123cc00973d419e1..c26b804015e80c46e1380d0a1af7f8f439c55405 100644 (file)
--- a/arch/arm64/mm/flush.c
+++ b/arch/arm64/mm/flush.c
@@ -60,14 +60,10 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
                       unsigned long uaddr, void *dst, const void *src,
                       unsigned long len)
 {
-#ifdef CONFIG_SMP
        preempt_disable();
-#endif
        memcpy(dst, src, len);
        flush_ptrace_access(vma, page, uaddr, dst, len);
-#ifdef CONFIG_SMP
        preempt_enable();
-#endif
 }
 
 void __sync_icache_dcache(pte_t pte, unsigned long addr)