Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[cascardo/linux.git] / arch / powerpc / lib / mem_64.S

diff --git a/arch/powerpc/lib/mem_64.S b/arch/powerpc/lib/mem_64.S
index 0738f96..eda7a96 100644 (file)
--- a/arch/powerpc/lib/mem_64.S
+++ b/arch/powerpc/lib/mem_64.S
@@ -37,6 +37,7 @@ _GLOBAL(memset)
        clrldi  r5,r5,58
        mtctr   r0
        beq     5f
+       .balign 16
 4:     std     r4,0(r6)
        std     r4,8(r6)
        std     r4,16(r6)
@@ -77,7 +78,7 @@ _GLOBAL(memset)
        stb     r4,0(r6)
        blr
 
-_GLOBAL(memmove)
+_GLOBAL_TOC(memmove)
        cmplw   0,r3,r4
        bgt     backwards_memcpy
        b       memcpy
@@ -90,6 +91,7 @@ _GLOBAL(backwards_memcpy)
        andi.   r0,r6,3
        mtctr   r7
        bne     5f
+       .balign 16
 1:     lwz     r7,-4(r4)
        lwzu    r8,-8(r4)
        stw     r7,-4(r6)