]> err.no Git - linux-2.6/commitdiff
sh: Fix optimized __copy_user() movca.l usage.
authorStuart Menefy <stuart.menefy@st.com>
Fri, 2 Nov 2007 03:14:09 +0000 (12:14 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 2 Nov 2007 03:14:09 +0000 (12:14 +0900)
movca.l is restricted to SH-4 and up only, though compilers that
are unable to support ISA tuning (especially older versions of
binutils) will happily compile in the bogus opcode on older parts.

Conditionalize it to fix SH-3 regressions noted by Kristoffer.

Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/mm/copy_page.S

index a81dbdb05596993a580e9fb69d876133c1990d9c..3d8409daa4beafc06d762248a85230fc5e3d6524 100644 (file)
@@ -255,7 +255,11 @@ EX(        mov.l   @r5+,r8         )
 EX(    mov.l   @r5+,r9         )
 EX(    mov.l   @r5+,r10        )
 EX(    mov.l   @r5+,r11        )
+#ifdef CONFIG_CPU_SH4
 EX(    movca.l r0,@r4          )
+#else
+EX(    mov.l   r0,@r4          )
+#endif
        add     #-32, r6
 EX(    mov.l   r1,@(4,r4)      )
        mov     #32, r0