From cb9d53e611b661d13300dd921e89448cf1aa16fb Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Thu, 30 Sep 2010 14:31:27 -0500 Subject: [PATCH] --- yaml --- r: 221653 b: refs/heads/master c: df8940eadf011db2d4bedecf6eb659d44494edb3 h: refs/heads/master i: 221651: 42304c2587bd1235a26fcaa70d8425cabfc551f9 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/booke_interrupts.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 61cfe4b27fcd..98818ff7f028 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb59e9748f9bc95212c7fe21468ba184938c48cb +refs/heads/master: df8940eadf011db2d4bedecf6eb659d44494edb3 diff --git a/trunk/arch/powerpc/kvm/booke_interrupts.S b/trunk/arch/powerpc/kvm/booke_interrupts.S index 049846911ce4..1cc471faac2d 100644 --- a/trunk/arch/powerpc/kvm/booke_interrupts.S +++ b/trunk/arch/powerpc/kvm/booke_interrupts.S @@ -416,7 +416,7 @@ lightweight_exit: lwz r3, VCPU_PC(r4) mtsrr0 r3 lwz r3, VCPU_SHARED(r4) - lwz r3, VCPU_SHARED_MSR(r3) + lwz r3, (VCPU_SHARED_MSR + 4)(r3) oris r3, r3, KVMPPC_MSR_MASK@h ori r3, r3, KVMPPC_MSR_MASK@l mtsrr1 r3