diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
| commit | a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a (patch) | |
| tree | 1d2061bbf8ac521bb9839075beb4263752bebb23 /arch/powerpc/include/asm/kvm_book3s_asm.h | |
| parent | 78e5dfea84dc15d69940831b3981b3014d17222e (diff) | |
| parent | 681c617b7c42fce0798c2b0b472f270f28c82d56 (diff) | |
Merge branch 'topic/ppc-kvm' into next
This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
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 ab386af2904f..d978fdf698af 100644 --- a/arch/powerpc/include/asm/kvm_book3s_asm.h +++ b/arch/powerpc/include/asm/kvm_book3s_asm.h @@ -119,6 +119,7 @@ struct kvmppc_host_state { u8 host_ipi; u8 ptid; /* thread number within subcore when split */ u8 tid; /* thread number within whole core */ + u8 fake_suspend; struct kvm_vcpu *kvm_vcpu; struct kvmppc_vcore *kvm_vcore; void __iomem *xics_phys; |