From: Avi Kivity <[email protected]> iommu.h needs phys_addr_t, so make it available.
Signed-off-by: Avi Kivity <[email protected]> diff --git a/ia64/external-module-compat.h b/ia64/external-module-compat.h index bc78c3d..8ccad90 100644 --- a/ia64/external-module-compat.h +++ b/ia64/external-module-compat.h @@ -5,6 +5,13 @@ #ifndef __ASSEMBLY__ #include <linux/version.h> +#include <linux/types.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) + +typedef u64 phys_addr_t; + +#endif + #include "../external-module-compat-comm.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) @@ -36,12 +43,6 @@ struct fdesc { }; #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) - -typedef u64 phys_addr_t; - -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) #define PAGE_KERNEL_UC __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX | \ diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h index c180506..3e6fc11 100644 --- a/x86/external-module-compat.h +++ b/x86/external-module-compat.h @@ -6,6 +6,13 @@ #include <linux/compiler.h> #include <linux/version.h> +#include <linux/types.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) + +typedef u64 phys_addr_t; + +#endif + #include "../external-module-compat-comm.h" #include <asm/msr.h> @@ -526,12 +533,6 @@ struct mtrr_state_type { #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) - -typedef u64 phys_addr_t; - -#endif - #ifndef CONFIG_HAVE_KVM_IRQCHIP #define CONFIG_HAVE_KVM_IRQCHIP 1 #endif -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
