diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2017-10-20 11:10:30 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-10-20 11:10:30 +1100 |
| commit | ddd46ed2e61cea6d5d92f4f2fbb2eeda4a6d962f (patch) | |
| tree | 52a46656f33cd4acf5a229c87ffafd101d1f51bb /arch/powerpc/include | |
| parent | powerpc/vphn: Fix numa update end-loop bug (diff) | |
| parent | KVM: PPC: Tie KVM_CAP_PPC_HTM to the user-visible TM feature (diff) | |
Merge branch 'topic/ppc-kvm' into next
Bring in some KVM commits we need (the TM one in particular).
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_book3s_asm.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h index 83596f32f50b..7cea76f11c26 100644 --- a/arch/powerpc/include/asm/kvm_book3s_asm.h +++ b/arch/powerpc/include/asm/kvm_book3s_asm.h @@ -104,10 +104,6 @@ struct kvmppc_host_state { u8 napping; #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE - /* - * hwthread_req/hwthread_state pair is used to pull sibling threads - * out of guest on pre-ISAv3.0B CPUs where threads share MMU. - */ u8 hwthread_req; u8 hwthread_state; u8 host_ipi; |