diff options
| author | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
| commit | 54ef2b96879334caf8803fdd93b4c556d709d6fd (patch) | |
| tree | 05cfeb36feeb4451f8f4c7069a86ae3490027daf /arch/arm64/include/asm/kvm_host.h | |
| parent | cdrom: Random writing support for BD-RE media (diff) | |
| parent | Merge tag 'v4.3-rc4' into for-4.4/core (diff) | |
| download | linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.tar.xz linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.zip | |
Merge branch 'for-4.4/core' into for-4.4/drivers
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'arch/arm64/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 4562459456a6..ed039688c221 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -33,6 +33,7 @@ #define KVM_USER_MEM_SLOTS 32 #define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 +#define KVM_HALT_POLL_NS_DEFAULT 500000 #include <kvm/arm_vgic.h> #include <kvm/arm_arch_timer.h> |