diff --git a/[refs] b/[refs] index 9c6f2e2b2731..3dc7e46374cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b0cbe97566dd7123eee0462d91703434fe61090 +refs/heads/master: 844ae3a0d1638753802770cde881dff0e0704551 diff --git a/trunk/arch/ppc64/boot/string.S b/trunk/arch/ppc64/boot/string.S index 7ade87ae7718..b1eeaed7db17 100644 --- a/trunk/arch/ppc64/boot/string.S +++ b/trunk/arch/ppc64/boot/string.S @@ -104,7 +104,7 @@ memmove: .globl memcpy memcpy: - rlwinm. r7,r5,32-3,3,31 /* r0 = r5 >> 3 */ + rlwinm. r7,r5,32-3,3,31 /* r7 = r5 >> 3 */ addi r6,r3,-4 addi r4,r4,-4 beq 2f /* if less than 8 bytes to do */ @@ -146,7 +146,7 @@ memcpy: .globl backwards_memcpy backwards_memcpy: - rlwinm. r7,r5,32-3,3,31 /* r0 = r5 >> 3 */ + rlwinm. r7,r5,32-3,3,31 /* r7 = r5 >> 3 */ add r6,r3,r5 add r4,r4,r5 beq 2f