diff --git a/[refs] b/[refs] index 6099a5fbc99a..0a52cb2360f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86e32fdce7c6582a52b9468106714779d871c773 +refs/heads/master: 03a22bfcfdfe88db8b4d2d9ee65476793038364f diff --git a/trunk/arch/powerpc/platforms/powernv/opal-wrappers.S b/trunk/arch/powerpc/platforms/powernv/opal-wrappers.S index afcddec5d3a1..3bb07e5e43cd 100644 --- a/trunk/arch/powerpc/platforms/powernv/opal-wrappers.S +++ b/trunk/arch/powerpc/platforms/powernv/opal-wrappers.S @@ -32,7 +32,7 @@ std r12,PACASAVEDMSR(r13); \ andc r12,r12,r0; \ mtmsrd r12,1; \ - LOAD_REG_ADDR(R0,.opal_return); \ + LOAD_REG_ADDR(r0,.opal_return); \ mtlr r0; \ li r0,MSR_DR|MSR_IR; \ andc r12,r12,r0; \