diff options
| author | Avi Kivity <avi@redhat.com> | 2012-05-08 17:00:13 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-05-08 17:00:13 +0300 |
| commit | f2569053e0b3ae092e2f35514f8d108647baa01f (patch) | |
| tree | f850e7d06b446c6bc598d12d40b2582ef274abf7 /arch/powerpc/kvm/book3s_64_vio_hv.c | |
| parent | 9f4260e73ac43aaa91eb5de95950e1de7002f467 (diff) | |
| parent | 54771e6217ce05a474827d9b23ff03de9d2ef2a0 (diff) | |
| download | linux-f2569053e0b3ae092e2f35514f8d108647baa01f.tar.gz | |
Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next
PPC updates from Alex. * 'for-upstream' of git://github.com/agraf/linux-2.6: KVM: PPC: Emulator: clean up SPR reads and writes KVM: PPC: Emulator: clean up instruction parsing kvm/powerpc: Add new ioctl to retreive server MMU infos kvm/book3s: Make kernel emulated H_PUT_TCE available for "PR" KVM KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler KVM: PPC: Book3S: Enable IRQs during exit handling KVM: PPC: Fix PR KVM on POWER7 bare metal KVM: PPC: Fix stbux emulation KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields KVM: PPC: Book3S: PR: No isync in slbie path KVM: PPC: Book3S: PR: Optimize entry path KVM: PPC: booke(hv): Fix save/restore of guest accessible SPRGs. KVM: PPC: Restrict PPC_[L|ST]D macro to asm code KVM: PPC: bookehv: Use a Macro for saving/restoring guest registers to/from their 64 bit copies. KVM: PPC: Use clockevent multiplier and shifter for decrementer KVM: Use minimum and maximum address mapped by TLB1 Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/book3s_64_vio_hv.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_vio_hv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c index ea0f8c537c28..30c2f3b134c6 100644 --- a/arch/powerpc/kvm/book3s_64_vio_hv.c +++ b/arch/powerpc/kvm/book3s_64_vio_hv.c @@ -38,6 +38,9 @@ #define TCES_PER_PAGE (PAGE_SIZE / sizeof(u64)) +/* WARNING: This will be called in real-mode on HV KVM and virtual + * mode on PR KVM + */ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, unsigned long ioba, unsigned long tce) { |