diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-25 10:51:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-25 10:51:40 -0700 |
| commit | b6d980f49342cbf823ef72fee8a572e43d43bcf8 (patch) | |
| tree | e38439273ffb49a5499c02dffe491b0c3edc3c6a /arch/s390 | |
| parent | 57cb635c5cb6eea54af02aea5edd003b6b2715a7 (diff) | |
| parent | 920552b213e3dc832a874b4e7ba29ecddbab31bc (diff) | |
| download | linux-b6d980f49342cbf823ef72fee8a572e43d43bcf8.tar.gz linux-b6d980f49342cbf823ef72fee8a572e43d43bcf8.tar.bz2 linux-b6d980f49342cbf823ef72fee8a572e43d43bcf8.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"AMD fixes for bugs introduced in the 4.2 merge window, and a few PPC
bug fixes too"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: disable halt_poll_ns as default for s390x
KVM: x86: fix off-by-one in reserved bits check
KVM: x86: use correct page table format to check nested page table reserved bits
KVM: svm: do not call kvm_set_cr0 from init_vmcb
KVM: x86: trap AMD MSRs for the TSeg base and mask
KVM: PPC: Book3S: Take the kvm->srcu lock in kvmppc_h_logical_ci_load/store()
KVM: PPC: Book3S HV: Pass the correct trap argument to kvmhv_commence_exit
KVM: PPC: Book3S HV: Fix handling of interrupted VCPUs
kvm: svm: reset mmu on VCPU reset
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 6ce4a0b7e8da..8ced426091e1 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -35,6 +35,7 @@ */ #define KVM_NR_IRQCHIPS 1 #define KVM_IRQCHIP_NUM_PINS 4096 +#define KVM_HALT_POLL_NS_DEFAULT 0 #define SIGP_CTRL_C 0x80 #define SIGP_CTRL_SCN_MASK 0x3f |