[PATCH] kvm-kmod vma_kernel_pagesize compatability

[PATCH] kvm-kmod vma_kernel_pagesize compatability

[Zachary Amsden]

[-- Attachment #1: Type: text/plain, Size: 25 bytes --]

Patch speaks for itself.

[-- Attachment #2: kmod-vma-kernel-pagesize-fix.patch --]
[-- Type: text/plain, Size: 1483 bytes --]

commit b5cd58bc3e7bddf0a9735d5c13c36e2221a7f616
Author: Zachary Amsden <zamsden@redhat.com>
Date:   Fri Aug 21 14:34:37 2009 -1000

    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 <zamsden@redhat.com>

diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h
index 3a31d51..da1a4f0 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;
 
diff --git a/linux-2.6 b/linux-2.6
index 5383e99..779cc54 160000
--- a/linux-2.6
+++ b/linux-2.6
@@ -1 +1 @@
-Subproject commit 5383e9982ee230b06b3c385e675ae6fc7846c40f
+Subproject commit 779cc54dbccaa3a00d70a9d61d090be5d9ccc903
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

Re: [PATCH] kvm-kmod vma_kernel_pagesize compatability

[Avi Kivity]

On 08/22/2009 03:38 AM, Zachary Amsden wrote:
>      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.
>    

Applied, thanks.


>
>      Signed-off-by: Zachary Amsden<zamsden@redhat.com>
>
> diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h
> index 3a31d51..da1a4f0 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;
>
>    

A #else was missing, which I added.

-- 
error compiling committee.c: too many arguments to function