diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/powerpc/kvm/booke_interrupts.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/powerpc/kvm/booke_interrupts.S')
| -rw-r--r-- | arch/powerpc/kvm/booke_interrupts.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S index 380a78cf484d..b58ccae95904 100644 --- a/arch/powerpc/kvm/booke_interrupts.S +++ b/arch/powerpc/kvm/booke_interrupts.S | |||
| @@ -380,7 +380,6 @@ lightweight_exit: | |||
| 380 | * because host interrupt handlers would get confused. */ | 380 | * because host interrupt handlers would get confused. */ |
| 381 | lwz r1, VCPU_GPR(r1)(r4) | 381 | lwz r1, VCPU_GPR(r1)(r4) |
| 382 | 382 | ||
| 383 | /* XXX handle USPRG0 */ | ||
| 384 | /* Host interrupt handlers may have clobbered these guest-readable | 383 | /* Host interrupt handlers may have clobbered these guest-readable |
| 385 | * SPRGs, so we need to reload them here with the guest's values. */ | 384 | * SPRGs, so we need to reload them here with the guest's values. */ |
| 386 | lwz r3, VCPU_SPRG4(r4) | 385 | lwz r3, VCPU_SPRG4(r4) |
| @@ -415,7 +414,8 @@ lightweight_exit: | |||
| 415 | lwz r8, VCPU_GPR(r8)(r4) | 414 | lwz r8, VCPU_GPR(r8)(r4) |
| 416 | lwz r3, VCPU_PC(r4) | 415 | lwz r3, VCPU_PC(r4) |
| 417 | mtsrr0 r3 | 416 | mtsrr0 r3 |
| 418 | lwz r3, VCPU_MSR(r4) | 417 | lwz r3, VCPU_SHARED(r4) |
| 418 | lwz r3, (VCPU_SHARED_MSR + 4)(r3) | ||
| 419 | oris r3, r3, KVMPPC_MSR_MASK@h | 419 | oris r3, r3, KVMPPC_MSR_MASK@h |
| 420 | ori r3, r3, KVMPPC_MSR_MASK@l | 420 | ori r3, r3, KVMPPC_MSR_MASK@l |
| 421 | mtsrr1 r3 | 421 | mtsrr1 r3 |