diff --git a/[refs] b/[refs] index a34e7caff160..2521bd73ceaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c81134b58c0857122cce23b29d41788e02a5024d +refs/heads/master: 0e670685e4925930000a678c74eb1cbf23b415fa diff --git a/trunk/arch/sh/mm/copy_page.S b/trunk/arch/sh/mm/copy_page.S index a81dbdb05596..3d8409daa4be 100644 --- a/trunk/arch/sh/mm/copy_page.S +++ b/trunk/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