diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-21 17:08:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-21 17:08:52 +0000 |
| commit | 5c1af2f870ab94f94f9dff231c6f18845e5a800a (patch) | |
| tree | 9cebefa529103691eab8561449c00d43d6420b34 /virt/kvm/kvm_main.c | |
| parent | c35983d487b56c023b70d6727ad002b19f935827 (diff) | |
| parent | 917a9133a6b3c6cc2b6b5649d28c617a4ccac3e6 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-16.03-rt
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 43fad2eed608..eeed326be12e 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1960,6 +1960,9 @@ static void grow_halt_poll_ns(struct kvm_vcpu *vcpu) else val *= halt_poll_ns_grow; + if (val > halt_poll_ns) + val = halt_poll_ns; + vcpu->halt_poll_ns = val; trace_kvm_halt_poll_ns_grow(vcpu->vcpu_id, val, old); } |