From a10f7ac0d4482c5dad6880a74b85cc952fcd0695 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Fri, 5 Apr 2013 19:20:30 +0000
Subject: [PATCH] --- yaml --- r: 373031 b: refs/heads/master c:
 8b415dcd762607379cf0a69c9dd25940da1d174e h: refs/heads/master i:   373029:
 994ac8c667cc731e9637ed6721e2ba1ce17eb421   373027:
 033ca4a7418fb6ee2caefae7b3de9ae06f061641   373023:
 120311570c073df0fc8907faae22e2a6c9a3fc9c v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/include/asm/kvm_host.h | 1 -
 trunk/include/linux/kvm_host.h        | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d28c863fbd9b..0489afab1721 100644
--- 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
index 628163c0c6e4..b2c7263c93b6 100644
--- 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
index 71fed38c7200..20d77d24d764 100644
--- 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)