diff options
| author | Michael Neuling <mikey@neuling.org> | 2014-08-19 14:59:30 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-09-22 10:11:31 +0200 |
| commit | 06a29e427432b4baaacc3b816b57e90fe08561ff (patch) | |
| tree | 01a083bb5cb37033fcaca30463aa06b8abcec85f | |
| parent | 2b2695a8d85593ec0253f7fdbeea1e18f0f9e5e2 (diff) | |
| download | op-kernel-dev-06a29e427432b4baaacc3b816b57e90fe08561ff.zip op-kernel-dev-06a29e427432b4baaacc3b816b57e90fe08561ff.tar.gz | |
KVM: PPC: Book3S HV: Add register name when loading toc
Add 'r' to register name r2 in kvmppc_hv_enter.
Also update comment at the top of kvmppc_hv_enter to indicate that R2/TOC is
non-volatile.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index f0c4db7..edb2ccd 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -355,6 +355,7 @@ kvmppc_hv_entry: * MSR = ~IR|DR * R13 = PACA * R1 = host R1 + * R2 = TOC * all other volatile GPRS = free */ mflr r0 @@ -503,7 +504,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) toc_tlbie_lock: .tc native_tlbie_lock[TC],native_tlbie_lock .previous - ld r3,toc_tlbie_lock@toc(2) + ld r3,toc_tlbie_lock@toc(r2) #ifdef __BIG_ENDIAN__ lwz r8,PACA_LOCK_TOKEN(r13) #else |
