diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-29 14:26:55 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-29 14:26:55 +0100 |
| commit | ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f (patch) | |
| tree | 7c0e2b94dfd54811714ad06705bf80df39a1f4e5 /include | |
| parent | bf65014d0b89b4e315f216f1f65b0d3410efcdc0 (diff) | |
| parent | 6ccad8cea5bcb0660f56677a5fdc52265f8ddf76 (diff) | |
| download | linux-ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f.tar.gz linux-ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f.tar.bz2 linux-ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f.zip | |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
PPC KVM update for 4.10:
* Support for KVM guests on POWER9 using the hashed page table MMU.
* Updates and improvements to the halt-polling support on PPC, from
Suraj Jitindar Singh.
* An optimization to speed up emulated MMIO, from Yongji Xie.
* Various other minor cleanups.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kvm_host.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/kvm.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 274bf343cbd0..913e4d77c0a8 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1113,6 +1113,10 @@ static inline bool kvm_check_request(int req, struct kvm_vcpu *vcpu) extern bool kvm_rebooting; +extern unsigned int halt_poll_ns; +extern unsigned int halt_poll_ns_grow; +extern unsigned int halt_poll_ns_shrink; + struct kvm_device { struct kvm_device_ops *ops; struct kvm *kvm; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 300ef255d1e0..e9f5ceffd741 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -651,6 +651,9 @@ struct kvm_enable_cap { }; /* for KVM_PPC_GET_PVINFO */ + +#define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) + struct kvm_ppc_pvinfo { /* out */ __u32 flags; @@ -682,8 +685,6 @@ struct kvm_ppc_smmu_info { struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ]; }; -#define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) - #define KVMIO 0xAE /* machine type bits, to be used as argument to KVM_CREATE_VM */ |