diff options
-rw-r--r-- | include/linux/kvm_host.h | 1 | ||||
-rw-r--r-- | virt/kvm/kvm_main.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 1a7f838d30c6..5f956cde1374 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
@@ -383,7 +383,6 @@ id_to_memslot(struct kvm_memslots *slots, int id) | |||
383 | static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; } | 383 | static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; } |
384 | 384 | ||
385 | extern struct page *bad_page; | 385 | extern struct page *bad_page; |
386 | extern pfn_t bad_pfn; | ||
387 | 386 | ||
388 | int is_error_page(struct page *page); | 387 | int is_error_page(struct page *page); |
389 | int is_error_pfn(pfn_t pfn); | 388 | int is_error_pfn(pfn_t pfn); |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0fbbf2d21603..f955eee92aa9 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -100,6 +100,9 @@ EXPORT_SYMBOL_GPL(kvm_rebooting); | |||
100 | 100 | ||
101 | static bool largepages_enabled = true; | 101 | static bool largepages_enabled = true; |
102 | 102 | ||
103 | struct page *bad_page; | ||
104 | static pfn_t bad_pfn; | ||
105 | |||
103 | static struct page *hwpoison_page; | 106 | static struct page *hwpoison_page; |
104 | static pfn_t hwpoison_pfn; | 107 | static pfn_t hwpoison_pfn; |
105 | 108 | ||
@@ -2691,9 +2694,6 @@ static struct syscore_ops kvm_syscore_ops = { | |||
2691 | .resume = kvm_resume, | 2694 | .resume = kvm_resume, |
2692 | }; | 2695 | }; |
2693 | 2696 | ||
2694 | struct page *bad_page; | ||
2695 | pfn_t bad_pfn; | ||
2696 | |||
2697 | static inline | 2697 | static inline |
2698 | struct kvm_vcpu *preempt_notifier_to_vcpu(struct preempt_notifier *pn) | 2698 | struct kvm_vcpu *preempt_notifier_to_vcpu(struct preempt_notifier *pn) |
2699 | { | 2699 | { |