Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / arch / sh / lib / copy_page.S

diff --git a/arch/sh/lib/copy_page.S b/arch/sh/lib/copy_page.S
index 43de7e8e4e17df58849aef36e69dd28895e46bab..9d7b8bc51866695a594fdba4615d2dd185c4ddd1 100644 (file)
--- a/arch/sh/lib/copy_page.S
+++ b/arch/sh/lib/copy_page.S
@@ -30,7 +30,9 @@ ENTRY(copy_page)
        mov     r4,r10
        mov     r5,r11
        mov     r5,r8
-       mov.l   .Lpsz,r0
+       mov     #(PAGE_SIZE >> 10), r0
+       shll8   r0
+       shll2   r0
        add     r0,r8
        !
 1:     mov.l   @r11+,r0
@@ -43,7 +45,6 @@ ENTRY(copy_page)
        mov.l   @r11+,r7
 #if defined(CONFIG_CPU_SH4)
        movca.l r0,@r10
-       mov     r10,r0
 #else
        mov.l   r0,@r10
 #endif
@@ -55,9 +56,6 @@ ENTRY(copy_page)
        mov.l   r3,@-r10
        mov.l   r2,@-r10
        mov.l   r1,@-r10
-#if defined(CONFIG_CPU_SH4)
-       ocbwb   @r0
-#endif
        cmp/eq  r11,r8
        bf/s    1b
         add    #28,r10
@@ -68,9 +66,6 @@ ENTRY(copy_page)
        rts
         nop
 
-       .balign 4
-.Lpsz: .long   PAGE_SIZE
-
 /*
  * __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
  * Return the number of bytes NOT copied