Skip to content

Commit

Permalink
KVM: make bad_pfn static to kvm_main.c
Browse files Browse the repository at this point in the history
bad_pfn is not used out of kvm_main.c, so mark it static, also move it near
hwpoison_pfn and fault_pfn

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  • Loading branch information
Xiao Guangrong authored and Marcelo Tosatti committed Jul 20, 2012
1 parent 903816f commit ca0565f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion include/linux/kvm_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions virt/kvm/kvm_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit ca0565f

Please sign in to comment.