From: Stuart Menefy Date: Fri, 2 Nov 2007 03:14:09 +0000 (+0900) Subject: sh: Fix optimized __copy_user() movca.l usage. X-Git-Tag: v2.6.24-rc2~47^2~6 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e670685e4925930000a678c74eb1cbf23b415fa;p=linux-2.6 sh: Fix optimized __copy_user() movca.l usage. 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 Signed-off-by: Paul Mundt --- diff --git a/arch/sh/mm/copy_page.S b/arch/sh/mm/copy_page.S index a81dbdb055..3d8409daa4 100644 --- a/arch/sh/mm/copy_page.S +++ b/arch/sh/mm/copy_page.S @@ -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