Skip to contentSkip to conversation

kvm-kmod vma_kernel_pagesize compatability

PATCH Applied Zachary Amsden 2 participants 2 messages Aug 22, 2009 – Aug 23, 2009 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm-kmod vma_kernel_pagesize compatability

Patch speaks for itself.

commit b5cd58bc3e7bddf0a9735d5c13c36e2221a7f616

Author: Zachary Amsden <[email protected]>
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.

external-module-compat-comm.h +1 -1
index 3a31d51..da1a4f0 100644
@@ -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;
 
linux-2.6 +1 -1
index 5383e99..779cc54 160000
@@ -1 +1 @@
-Subproject commit 5383e9982ee230b06b3c385e675ae6fc7846c40f
+Subproject commit 779cc54dbccaa3a00d70a9d61d090be5d9ccc903
sync +1 -0
index ac8ea05..539a3f0 100755
@@ -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
Applied
#1 lore raw
Quoted 3 lines · Zachary Amsden

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.

Quoted 9 lines
external-module-compat-comm.h +0 -0
index 3a31d51..da1a4f0 100644

external-module-compat-comm.h static inline int kvm_eventfd_signal(struct eventfd_ctx *ctx, int n) · line 964

Quoted 8 lines
external-module-compat-comm.h +1 -1
@@ -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.

Signature · 1 line
error compiling committee.c: too many arguments to function