Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[mirror_ubuntu-bionic-kernel.git] / include / linux / kvm_types.h

diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h
index 1b47a185c2f0b5a567c6cbb97f96d2d050cf79cb..8bf259dae9f6cc278bb2c8623507c452f8d61694 100644 (file)
--- a/include/linux/kvm_types.h
+++ b/include/linux/kvm_types.h
@@ -53,7 +53,7 @@ typedef unsigned long  hva_t;
 typedef u64            hpa_t;
 typedef u64            hfn_t;
 
-typedef hfn_t pfn_t;
+typedef hfn_t kvm_pfn_t;
 
 struct gfn_to_hva_cache {
        u64 generation;