GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-05 22:28:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

KVM: PPC: bookehv: fix exit timing

Browse source 
When using exit timing stats, we clobber r9 in the NEED_EMU case,
so better move that part down a few lines and fix it that way.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Alexander Graf 2012-02-16 14:34:55 +00:00 • committed by Avi Kivity
parent 8b3a00fcd3
commit 73ede8d32b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/powerpc/kvm/bookehv_interrupts.S
View file

@ -83,10 +83,6 @@
stw r10, VCPU_GUEST_PID(r4) stw r10, VCPU_GUEST_PID(r4)
mtspr SPRN_PID, r8 mtspr SPRN_PID, r8
.if \flags & NEED_EMU
lwz r9, VCPU_KVM(r4)
.endif
#ifdef CONFIG_KVM_EXIT_TIMING #ifdef CONFIG_KVM_EXIT_TIMING
/* save exit time */ /* save exit time */
1: mfspr r7, SPRN_TBRU 1: mfspr r7, SPRN_TBRU
@ -98,6 +94,10 @@
PPC_STL r9, VCPU_TIMING_EXIT_TBU(r4) PPC_STL r9, VCPU_TIMING_EXIT_TBU(r4)
#endif #endif
.if \flags & NEED_EMU
lwz r9, VCPU_KVM(r4)
.endif
oris r8, r6, MSR_CE@h oris r8, r6, MSR_CE@h
#ifndef CONFIG_64BIT #ifndef CONFIG_64BIT
stw r6, (VCPU_SHARED_MSR + 4)(r11) stw r6, (VCPU_SHARED_MSR + 4)(r11)