diff mbox

[05/12] Fix kvm_vma_kernel_pagesize for pre-2.6.27 kernels

Message ID 20091019105924.3988.70996.stgit@mchn012c.ww002.siemens.net (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Kiszka Oct. 19, 2009, 10:59 a.m. UTC 
None
diff mbox

Patch

diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h
index fd3aab7..2892ace 100644
--- a/external-module-compat-comm.h
+++ b/external-module-compat-comm.h
@@ -957,7 +957,7 @@  static inline int kvm_eventfd_signal(struct eventfd_ctx *ctx, int n)
 /* vma_kernel_pagesize, exported since 2.6.32 */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
 
-#ifdef CONFIG_HUGETLB_PAGE
+#if defined(CONFIG_HUGETLB_PAGE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)
 static inline
 unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma)
 {
@@ -970,7 +970,7 @@  unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma)
 
 	return 1UL << (hstate->order + PAGE_SHIFT);
 }
-#else /* !CONFIG_HUGETLB_SIZE */
+#else /* !CONFIG_HUGETLB_SIZE || <= 2.6.26 */
 #define kvm_vma_kernel_pagesize(v) PAGE_SIZE
 #endif