diff --git a/[refs] b/[refs] index 0a54359b86d6..9301def92116 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25a8a02d26a71c28e26417a3520c653c2d40af6b +refs/heads/master: d35feb26ef7e9fbef7643051be5f0773662b1f91 diff --git a/trunk/arch/powerpc/kvm/book3s_64_interrupts.S b/trunk/arch/powerpc/kvm/book3s_64_interrupts.S index 33aef5345f6b..2ff0b2137e6f 100644 --- a/trunk/arch/powerpc/kvm/book3s_64_interrupts.S +++ b/trunk/arch/powerpc/kvm/book3s_64_interrupts.S @@ -177,8 +177,9 @@ kvmppc_handler_highmem: rldicl. r5, r5, 0, 63 /* CR = ((r5 & 1) == 0) */ beq no_dcbz32_off + li r4, 0 mfspr r5,SPRN_HID5 - rldimi r5,r5,6,56 + rldimi r5,r4,6,56 mtspr SPRN_HID5,r5 no_dcbz32_off: