---

yaml --- r: 373031 b: refs/heads/master c: 8b415dc h: refs/heads/master i: 373029: 994ac8c 373027: 033ca4a 373023: 1203115 v: v3
git-mirror · Apr 8, 2013 · a10f7ac · a10f7ac
1 parent efe913d
commit a10f7ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3ba45b8041740f4ab8bbba3c6239876661aeed6
+refs/heads/master: 8b415dcd762607379cf0a69c9dd25940da1d174e
diff --git a/trunk/arch/x86/include/asm/kvm_host.h b/trunk/arch/x86/include/asm/kvm_host.h
@@ -972,7 +972,6 @@ enum {
  * Trap the fault and ignore the instruction if that happens.
  */
 asmlinkage void kvm_spurious_fault(void);
-extern bool kvm_rebooting;
 
 #define ____kvm_handle_fault_on_reboot(insn, cleanup_insn)	\
 	"666: " insn "\n\t" \

diff --git a/trunk/include/linux/kvm_host.h b/trunk/include/linux/kvm_host.h
@@ -1061,6 +1061,8 @@ static inline bool kvm_check_request(int req, struct kvm_vcpu *vcpu)
 	}
 }
 
+extern bool kvm_rebooting;
+
 #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
 
 static inline void kvm_vcpu_set_in_spin_loop(struct kvm_vcpu *vcpu, bool val)
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     }
+    extern bool kvm_rebooting;
     #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
     static inline void kvm_vcpu_set_in_spin_loop(struct kvm_vcpu *vcpu, bool val)
@@ Expand Down @@