aboutsummaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>2012-07-17 09:54:11 -0400
committerMarcelo Tosatti <mtosatti@redhat.com>2012-07-19 20:15:25 -0400
commit903816fa4d016e20ec71a1a97700cfcdda115580 (patch)
treec7208520a6de2f0170ce181517d3ea9479eb2eb7 /virt
parent86fde74cf5b829627b37ca86322acfdd99b524b8 (diff)
KVM: using get_fault_pfn to get the fault pfn
Using get_fault_pfn to cleanup the code Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e2b1a159e5df..0fbbf2d21603 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -103,8 +103,8 @@ static bool largepages_enabled = true;
103static struct page *hwpoison_page; 103static struct page *hwpoison_page;
104static pfn_t hwpoison_pfn; 104static pfn_t hwpoison_pfn;
105 105
106struct page *fault_page; 106static struct page *fault_page;
107pfn_t fault_pfn; 107static pfn_t fault_pfn;
108 108
109inline int kvm_is_mmio_pfn(pfn_t pfn) 109inline int kvm_is_mmio_pfn(pfn_t pfn)
110{ 110{
@@ -949,12 +949,6 @@ int is_hwpoison_pfn(pfn_t pfn)
949} 949}
950EXPORT_SYMBOL_GPL(is_hwpoison_pfn); 950EXPORT_SYMBOL_GPL(is_hwpoison_pfn);
951 951
952int is_fault_pfn(pfn_t pfn)
953{
954 return pfn == fault_pfn;
955}
956EXPORT_SYMBOL_GPL(is_fault_pfn);
957
958int is_noslot_pfn(pfn_t pfn) 952int is_noslot_pfn(pfn_t pfn)
959{ 953{
960 return pfn == bad_pfn; 954 return pfn == bad_pfn;
@@ -1038,11 +1032,12 @@ unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn)
1038} 1032}
1039EXPORT_SYMBOL_GPL(gfn_to_hva); 1033EXPORT_SYMBOL_GPL(gfn_to_hva);
1040 1034
1041static pfn_t get_fault_pfn(void) 1035pfn_t get_fault_pfn(void)
1042{ 1036{
1043 get_page(fault_page); 1037 get_page(fault_page);
1044 return fault_pfn; 1038 return fault_pfn;
1045} 1039}
1040EXPORT_SYMBOL_GPL(get_fault_pfn);
1046 1041
1047int get_user_page_nowait(struct task_struct *tsk, struct mm_struct *mm, 1042int get_user_page_nowait(struct task_struct *tsk, struct mm_struct *mm,
1048 unsigned long start, int write, struct page **page) 1043 unsigned long start, int write, struct page **page)