Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / arch / sh / lib / clear_page.S

diff --git a/arch/sh/lib/clear_page.S b/arch/sh/lib/clear_page.S
index 7a7c81ee3f01659b14f24d818c02cb4e5f525f07..8342bfbde64c23a1f1128785b1ed810ba4f46b86 100644 (file)
--- a/arch/sh/lib/clear_page.S
+++ b/arch/sh/lib/clear_page.S
@@ -9,10 +9,10 @@
 #include <asm/page.h>
 
 /*
- * clear_page_slow
+ * clear_page
  * @to: P1 address
  *
- * void clear_page_slow(void *to)
+ * void clear_page(void *to)
  */
 
 /*
@@ -20,18 +20,18 @@
  * r4 --- to
  * r5 --- to + PAGE_SIZE
  */
-ENTRY(clear_page_slow)
+ENTRY(clear_page)
        mov     r4,r5
        mov.l   .Llimit,r0
        add     r0,r5
        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
@@ -50,6 +50,8 @@ ENTRY(clear_page_slow)
        !
        rts
         nop
+
+       .balign 4
 .Llimit:       .long   (PAGE_SIZE-28)
 
 ENTRY(__clear_user)