From b70b1d4d6b5f19c173dbaf64890124911e2172bb Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Tue, 17 Jul 2012 21:54:52 +0800
Subject: [PATCH] --- yaml --- r: 329800 b: refs/heads/master c:
 ca0565f5736e67af3172d188577b57e303dd082a h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/kvm_host.h | 1 -
 trunk/virt/kvm/kvm_main.c      | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2614b20da0aa..f59ac4fef6ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 903816fa4d016e20ec71a1a97700cfcdda115580
+refs/heads/master: ca0565f5736e67af3172d188577b57e303dd082a
diff --git a/trunk/include/linux/kvm_host.h b/trunk/include/linux/kvm_host.h
index 1a7f838d30c6..5f956cde1374 100644
--- a/trunk/include/linux/kvm_host.h
+++ b/trunk/include/linux/kvm_host.h
@@ -383,7 +383,6 @@ id_to_memslot(struct kvm_memslots *slots, int id)
 static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; }
 
 extern struct page *bad_page;
-extern pfn_t bad_pfn;
 
 int is_error_page(struct page *page);
 int is_error_pfn(pfn_t pfn);
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index 0fbbf2d21603..f955eee92aa9 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -100,6 +100,9 @@ EXPORT_SYMBOL_GPL(kvm_rebooting);
 
 static bool largepages_enabled = true;
 
+struct page *bad_page;
+static pfn_t bad_pfn;
+
 static struct page *hwpoison_page;
 static pfn_t hwpoison_pfn;
 
@@ -2691,9 +2694,6 @@ static struct syscore_ops kvm_syscore_ops = {
 	.resume = kvm_resume,
 };
 
-struct page *bad_page;
-pfn_t bad_pfn;
-
 static inline
 struct kvm_vcpu *preempt_notifier_to_vcpu(struct preempt_notifier *pn)
 {