compiles and loads, user level gets segv

1 files changed, 4 insertions, 4 deletions

diff --git a/kvm_host.h b/kvm_host.h
index 0d8737a..4cd0190 100644
--- a/kvm_host.h
+++ b/kvm_host.h
@@ -194,9 +194,9 @@ void kvm_put_kvm(struct kvm *kvm);
 #define HPA_MSB ((sizeof(hpa_t) * 8) - 1)
 #define HPA_ERR_MASK ((hpa_t)1 << HPA_MSB)
 static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; }
-struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva);
+caddr_t gva_to_page(struct kvm_vcpu *vcpu, gva_t gva);
 
-extern struct page *bad_page;
+extern caddr_t bad_page;
 extern pfn_t bad_pfn;
 
 int is_error_page(struct page *page);
@@ -222,7 +222,7 @@ void kvm_arch_flush_shadow(struct kvm *kvm);
 gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn);
 gfn_t unalias_gfn_instantiation(struct kvm *kvm, gfn_t gfn);
 
-struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn);
+caddr_t gfn_to_page(struct kvm *kvm, gfn_t gfn);
 unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn);
 void kvm_release_page_clean(struct page *page);
 void kvm_release_page_dirty(struct page *page);
@@ -450,7 +450,7 @@ static inline void kvm_guest_exit(void)
 	current->flags &= ~PF_VCPU;
 }
 
-static inline gpa_t gfn_to_gpa(gfn_t gfn)
+inline gpa_t gfn_to_gpa(gfn_t gfn)
 {
 	return (gpa_t)gfn << PAGE_SHIFT;
 }