diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 18:29:01 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 18:29:01 +0100 |
| commit | b73117c49364551ff789db7c424a115ac5b77850 (patch) | |
| tree | e151d34e68ef6061f1ac10f5db0aff262dc3aff5 /arch/powerpc/include/asm/kvm_book3s_asm.h | |
| parent | 77f01bdfa5e55dc19d3eb747181d2730a9bb3ca8 (diff) | |
| parent | 4068890931f62752abc3591e7b3736e7537c6dcb (diff) | |
| download | linux-b73117c49364551ff789db7c424a115ac5b77850.tar.bz2 | |
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
Conflicts:
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/booke.c
Diffstat (limited to 'arch/powerpc/include/asm/kvm_book3s_asm.h')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_book3s_asm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h index 192917d2239c..f3a91dc02c98 100644 --- a/arch/powerpc/include/asm/kvm_book3s_asm.h +++ b/arch/powerpc/include/asm/kvm_book3s_asm.h @@ -88,6 +88,7 @@ struct kvmppc_host_state { u8 hwthread_req; u8 hwthread_state; u8 host_ipi; + u8 ptid; struct kvm_vcpu *kvm_vcpu; struct kvmppc_vcore *kvm_vcore; unsigned long xics_phys; |