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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
---

 external-module-compat-comm.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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
 

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux