diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-03-21 18:07:04 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-04-18 09:50:02 -0700 |
| commit | 5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1 (patch) | |
| tree | e783f5ee9852c53f4161f1c70cd95ab7e0f1f81c /arch/sh | |
| parent | 2163b4cb01cd79cd1291696fc4636740026d61cb (diff) | |
| download | linux-3.10-5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1.tar.gz linux-3.10-5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1.tar.bz2 linux-3.10-5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1.zip | |
sh: Allow optimized clear/copy page routines to be used on SH-2.
Presently these are restricted to SH-3 and SH-4, so we reorder the
ifdefs a bit to let other parts use these also.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/lib/clear_page.S | 6 | ||||
| -rw-r--r-- | arch/sh/lib/copy_page.S | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/lib/clear_page.S b/arch/sh/lib/clear_page.S index 3539123fe51..8342bfbde64 100644 --- a/arch/sh/lib/clear_page.S +++ b/arch/sh/lib/clear_page.S @@ -27,11 +27,11 @@ ENTRY(clear_page) mov #0,r0 ! 1: -#if defined(CONFIG_CPU_SH3) - mov.l r0,@r4 -#elif defined(CONFIG_CPU_SH4) +#if defined(CONFIG_CPU_SH4) movca.l r0,@r4 mov r4,r1 +#else + mov.l r0,@r4 #endif add #32,r4 mov.l r0,@-r4 diff --git a/arch/sh/lib/copy_page.S b/arch/sh/lib/copy_page.S index e002b91c875..5d12e657be3 100644 --- a/arch/sh/lib/copy_page.S +++ b/arch/sh/lib/copy_page.S @@ -41,11 +41,11 @@ ENTRY(copy_page) mov.l @r11+,r5 mov.l @r11+,r6 mov.l @r11+,r7 -#if defined(CONFIG_CPU_SH3) - mov.l r0,@r10 -#elif defined(CONFIG_CPU_SH4) +#if defined(CONFIG_CPU_SH4) movca.l r0,@r10 mov r10,r0 +#else + mov.l r0,@r10 #endif add #32,r10 mov.l r7,@-r10 |