diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-11-01 15:33:39 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2017-11-01 15:33:39 +1100 |
| commit | 3e8f150a3bc30214c15e5f8d27e4b2d904bd929e (patch) | |
| tree | 0b7aec14c8340153c58fb7354f923ec4a1bb4e7a /arch/powerpc/include | |
| parent | 93897a1f4b1a96171b4a445207a371df1b0d4601 (diff) | |
| parent | 2a3d6553cbd791da4fb624c2500b4580b3f9d72f (diff) | |
| download | op-kernel-dev-3e8f150a3bc30214c15e5f8d27e4b2d904bd929e.zip op-kernel-dev-3e8f150a3bc30214c15e5f8d27e4b2d904bd929e.tar.gz | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the ppc-kvm topic branch of the powerpc tree to get the
commit that reverts the patch "KVM: PPC: Book3S HV: POWER9 does not
require secondary thread management". This is needed for subsequent
patches which will be applied on this branch.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
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 83596f3..7cea76f 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; |
