From: Zachary Amsden <[email protected]> Make vma_kernel_pagesize a kvm compat API; this fixes the build with new kernels synced to 2.6.31 compiling externally for older systems.
Signed-off-by: Zachary Amsden <[email protected]> Signed-off-by: Avi Kivity <[email protected]> diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h index 3a31d51..44b5511 100644 --- a/external-module-compat-comm.h +++ b/external-module-compat-comm.h @@ -958,7 +958,7 @@ static inline int kvm_eventfd_signal(struct eventfd_ctx *ctx, int n) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) static inline -unsigned long vma_kernel_pagesize(struct vm_area_struct *vma) +unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma) { struct hstate *hstate; @@ -970,4 +970,8 @@ unsigned long vma_kernel_pagesize(struct vm_area_struct *vma) return 1UL << (hstate->order + PAGE_SHIFT); } +#else + +#define kvm_vma_kernel_pagesize vma_kernel_pagesize + #endif diff --git a/sync b/sync index ac8ea05..539a3f0 100755 --- a/sync +++ b/sync @@ -38,6 +38,7 @@ def __hack(data): 'init_srcu_struct cleanup_srcu_struct srcu_read_lock ' 'srcu_read_unlock synchronize_srcu srcu_batches_completed ' 'do_machine_check eventfd_signal get_desc_base get_desc_limit ' + 'vma_kernel_pagesize ' ) anon_inodes = anon_inodes_exit = False mce = False -- 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
