diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 14:14:24 (GMT) |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 14:14:24 (GMT) |
commit | bebcb8dab6bac53b6a61a896db03781d1992cadb (patch) | |
tree | 4793b0c2e913db8cf573ee52d568471603273af6 /arch/arm64/include | |
parent | 26c21dd9885a2d8a4f4d539917c4877ffd399286 (diff) | |
parent | f1e0bb0ad473a32d1b7e6d285ae9f7e47710bb5e (diff) | |
download | linux-bebcb8dab6bac53b6a61a896db03781d1992cadb.tar.xz |
Merge branch 'irq/for-arm' into irq/core
Bring in the change which we offered arm[64] folks to pull into their
trees.
Diffstat (limited to 'arch/arm64/include')
-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 4562459..ed03968 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> |