summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2009-06-09 15:37:03 +0200
committerAvi Kivity <avi@redhat.com>2009-09-10 08:32:57 +0300
commit681405bfc73a2717ae9b03b2bad465b009106f31 (patch)
tree4b6d8a726a200f188434487f32fe6b29aa38e624 /arch/x86
parentf7104db26ab2bc5f642892774ac8fb0f15400969 (diff)
KVM: Drop useless atomic test from timer function
The current code tries to optimize the setting of KVM_REQ_PENDING_TIMER but used atomic_inc_and_test - which always returns true unless pending had the invalid value of -1 on entry. This patch drops the test part preserving the original semantic but expressing it less confusingly. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/timer.c b/arch/x86/kvm/timer.c
index 1baed414b57a..eea40439066c 100644
--- a/arch/x86/kvm/timer.c
+++ b/arch/x86/kvm/timer.c
@@ -15,9 +15,9 @@ static int __kvm_timer_fn(struct kvm_vcpu *vcpu, struct kvm_timer *ktimer)
* case anyway.
*/
if (ktimer->reinject || !atomic_read(&ktimer->pending)) {
+ atomic_inc(&ktimer->pending);
/* FIXME: this code should not know anything about vcpus */
- if (!atomic_inc_and_test(&ktimer->pending))
- set_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests);
+ set_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests);
}
if (waitqueue_active(q))