diff mbox

[v2,2/2] kvm: x86: Drop useless atomic test from timer function

Message ID 4A2E657F.8080908@siemens.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Kiszka June 9, 2009, 1:37 p.m. UTC
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>

 arch/x86/kvm/timer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox


diff --git a/arch/x86/kvm/timer.c b/arch/x86/kvm/timer.c
index 36054e9..8dd1a55 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))