Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / sh / lib / clear_page.S

diff --git a/arch/sh/lib/clear_page.S b/arch/sh/lib/clear_page.S
index 36d44ef2b8a265e872eeacc7b685e0aa166c8070..8342bfbde64c23a1f1128785b1ed810ba4f46b86 100644 (file)
--- 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
@@ -50,6 +50,8 @@ ENTRY(clear_page)
        !
        rts
         nop
+
+       .balign 4
 .Llimit:       .long   (PAGE_SIZE-28)
 
 ENTRY(__clear_user)