nds32: Disable local irq before calling cpu_dcache_wb_page in copy_user_highpage

In order to ensure that all data in source page has been written back
to memory before copy_page, the local irq shall be disabled before
calling cpu_dcache_wb_page(). In addition, removing unneeded page
invalidation for 'to' page.

Signed-off-by: Vincent Chen <vincentc@andestech.com>
Reviewed-by: Greentime Hu <greentime@andestech.com>
Signed-off-by: Greentime Hu <greentime@andestech.com>

diff --git a/arch/nds32/mm/cacheflush.c b/arch/nds32/mm/cacheflush.c
index ae31cd2c21be3903d01a15bb7b3a90db90a09916..ce8fd34497bf045beafa845d2df1500b00281a4c 100644 (file)
--- a/arch/nds32/mm/cacheflush.c
+++ b/arch/nds32/mm/cacheflush.c
@@ -175,11 +175,9 @@ void copy_user_highpage(struct page *to, struct page *from,
        pto = page_to_phys(to);
        pfrom = page_to_phys(from);
 
+       local_irq_save(flags);
        if (aliasing(vaddr, (unsigned long)kfrom))
                cpu_dcache_wb_page((unsigned long)kfrom);
-       if (aliasing(vaddr, (unsigned long)kto))
-               cpu_dcache_inval_page((unsigned long)kto);
-       local_irq_save(flags);
        vto = kremap0(vaddr, pto);
        vfrom = kremap1(vaddr, pfrom);
        copy_page((void *)vto, (void *)vfrom);