diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-03-21 05:07:04 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-04-18 12:50:02 -0400 |
commit | 5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1 (patch) | |
tree | e783f5ee9852c53f4161f1c70cd95ab7e0f1f81c /arch | |
parent | 2163b4cb01cd79cd1291696fc4636740026d61cb (diff) |
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')
-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 3539123fe517..8342bfbde64c 100644 --- a/arch/sh/lib/clear_page.S +++ b/arch/sh/lib/clear_page.S | |||
@@ -27,11 +27,11 @@ ENTRY(clear_page) | |||
27 | mov #0,r0 | 27 | mov #0,r0 |
28 | ! | 28 | ! |
29 | 1: | 29 | 1: |
30 | #if defined(CONFIG_CPU_SH3) | 30 | #if defined(CONFIG_CPU_SH4) |
31 | mov.l r0,@r4 | ||
32 | #elif defined(CONFIG_CPU_SH4) | ||
33 | movca.l r0,@r4 | 31 | movca.l r0,@r4 |
34 | mov r4,r1 | 32 | mov r4,r1 |
33 | #else | ||
34 | mov.l r0,@r4 | ||
35 | #endif | 35 | #endif |
36 | add #32,r4 | 36 | add #32,r4 |
37 | mov.l r0,@-r4 | 37 | mov.l r0,@-r4 |
diff --git a/arch/sh/lib/copy_page.S b/arch/sh/lib/copy_page.S index e002b91c8752..5d12e657be34 100644 --- a/arch/sh/lib/copy_page.S +++ b/arch/sh/lib/copy_page.S | |||
@@ -41,11 +41,11 @@ ENTRY(copy_page) | |||
41 | mov.l @r11+,r5 | 41 | mov.l @r11+,r5 |
42 | mov.l @r11+,r6 | 42 | mov.l @r11+,r6 |
43 | mov.l @r11+,r7 | 43 | mov.l @r11+,r7 |
44 | #if defined(CONFIG_CPU_SH3) | 44 | #if defined(CONFIG_CPU_SH4) |
45 | mov.l r0,@r10 | ||
46 | #elif defined(CONFIG_CPU_SH4) | ||
47 | movca.l r0,@r10 | 45 | movca.l r0,@r10 |
48 | mov r10,r0 | 46 | mov r10,r0 |
47 | #else | ||
48 | mov.l r0,@r10 | ||
49 | #endif | 49 | #endif |
50 | add #32,r10 | 50 | add #32,r10 |
51 | mov.l r7,@-r10 | 51 | mov.l r7,@-r10 |