From a40ee00989679411dfe6d7695a549582ae380fbf Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Tue, 16 Oct 2007 17:22:08 +0200
Subject: [PATCH] --- yaml --- r: 80663 b: refs/heads/master c:
 3176bc3e59cc4e30ac10888f08124b31969a7a88 h: refs/heads/master i:   80661:
 914fa8c679b0948ae31470468a3e4f747ffdd67b   80659:
 9727cc05f92a5870c0bf807a27e4914e7e6b5081   80655:
 fedca51d2c61dae85d3b399f0c18392508cd1797 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm.h      | 2 +-
 trunk/drivers/kvm/kvm_main.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 31c215507b86..ba4eeab4992f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab6ef34b906546d85d92dbc3e0fb4e01cce05f62
+refs/heads/master: 3176bc3e59cc4e30ac10888f08124b31969a7a88
diff --git a/trunk/drivers/kvm/kvm.h b/trunk/drivers/kvm/kvm.h
index 1edf8a5e365e..6ae7b6332e32 100644
--- a/trunk/drivers/kvm/kvm.h
+++ b/trunk/drivers/kvm/kvm.h
@@ -67,7 +67,7 @@
 /*
  * vcpu->requests bit members
  */
-#define KVM_TLB_FLUSH 0
+#define KVM_REQ_TLB_FLUSH          0
 
 /*
  * Address types:
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index 4c96817929fd..1879b409bed2 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -212,7 +212,7 @@ void kvm_flush_remote_tlbs(struct kvm *kvm)
 		vcpu = kvm->vcpus[i];
 		if (!vcpu)
 			continue;
-		if (test_and_set_bit(KVM_TLB_FLUSH, &vcpu->requests))
+		if (test_and_set_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests))
 			continue;
 		cpu = vcpu->cpu;
 		if (cpu != -1 && cpu != raw_smp_processor_id())
@@ -2171,7 +2171,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 	kvm_guest_enter();
 
 	if (vcpu->requests)
-		if (test_and_clear_bit(KVM_TLB_FLUSH, &vcpu->requests))
+		if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests))
 			kvm_x86_ops->tlb_flush(vcpu);
 
 	kvm_x86_ops->run(vcpu, kvm_run);