diff --git a/[refs] b/[refs] index 4d1e141146e7..75d40bcd068d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c04a695a4484467889d0c91c2e377c6abcecd5d5 +refs/heads/master: 1bec1677ca5b3406dc1f174b61beaeb832eed715 diff --git a/trunk/arch/powerpc/kvm/book3s_64_slb.S b/trunk/arch/powerpc/kvm/book3s_64_slb.S index 35b762722187..091967907954 100644 --- a/trunk/arch/powerpc/kvm/book3s_64_slb.S +++ b/trunk/arch/powerpc/kvm/book3s_64_slb.S @@ -145,7 +145,7 @@ slb_do_enter: lwz r11, (PACA_KVM_CR)(r13) mtcr r11 - ld r11, (PACA_KVM_XER)(r13) + lwz r11, (PACA_KVM_XER)(r13) mtxer r11 ld r11, (PACA_KVM_R11)(r13)