Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[sfrench/cifs-2.6.git] / arch / powerpc / lib / mem_64.S

diff --git a/arch/powerpc/lib/mem_64.S b/arch/powerpc/lib/mem_64.S
index 2d128df161ec5a4643f3e7eace6766cc598fc06c..85fa9869aec5848d1c22c7b24e297cb51f1d4a9d 100644 (file)
--- a/arch/powerpc/lib/mem_64.S
+++ b/arch/powerpc/lib/mem_64.S
@@ -38,6 +38,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)
@@ -92,6 +93,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)