diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2017-07-03 10:41:59 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-07-03 10:41:59 +0200 |
commit | 8a53e7e572252e551fd4b172dc207f8beca1ae20 (patch) | |
tree | f3b83b47815ab2b56377188d02c7217048056c2d /arch/powerpc/include/asm/kvm_book3s.h | |
parent | 00c14757f6abacd78cad9b2690a0e1f42e4b76c8 (diff) | |
parent | 8b24e69fc47e43679bb29ddb481aa0e8dce2a3c5 (diff) | |
download | talos-obmc-linux-8a53e7e572252e551fd4b172dc207f8beca1ae20.tar.gz talos-obmc-linux-8a53e7e572252e551fd4b172dc207f8beca1ae20.zip |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
- Better machine check handling for HV KVM
- Ability to support guests with threads=2, 4 or 8 on POWER9
- Fix for a race that could cause delayed recognition of signals
- Fix for a bug where POWER9 guests could sleep with interrupts
pending.
Diffstat (limited to 'arch/powerpc/include/asm/kvm_book3s.h')
-rw-r--r-- | arch/powerpc/include/asm/kvm_book3s.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index 2bf35017ffc0..b8d5b8e35244 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -86,7 +86,6 @@ struct kvmppc_vcore { u16 last_cpu; u8 vcore_state; u8 in_guest; - struct kvmppc_vcore *master_vcore; struct kvm_vcpu *runnable_threads[MAX_SMT_THREADS]; struct list_head preempt_list; spinlock_t lock; |