From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH 3/9] kvm_vma_kernel_pagesize support Date: Fri, 25 Sep 2009 18:18:01 +0200 Message-ID: <20090925161801.3328.96058.stgit@mchn012c.ww002.siemens.net> References: <20090925161801.3328.30406.stgit@mchn012c.ww002.siemens.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Avi Kivity Return-path: Received: from goliath.siemens.de ([192.35.17.28]:21568 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753208AbZIYQUs (ORCPT ); Fri, 25 Sep 2009 12:20:48 -0400 In-Reply-To: <20090925161801.3328.30406.stgit@mchn012c.ww002.siemens.net> Sender: kvm-owner@vger.kernel.org List-ID: It was broken for !CONFIG_HUGETLB_PAGE and for kernel 2.6.31. Signed-off-by: Jan Kiszka --- external-module-compat-comm.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h index c72fb86..47fdc86 100644 --- a/external-module-compat-comm.h +++ b/external-module-compat-comm.h @@ -954,9 +954,10 @@ static inline int kvm_eventfd_signal(struct eventfd_ctx *ctx, int n) #include -/* vma_kernel_pagesize, 2.6.29 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +/* vma_kernel_pagesize, exported since 2.6.32 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) +#ifdef CONFIG_HUGETLB_PAGE static inline unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma) { @@ -969,8 +970,11 @@ unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma) return 1UL << (hstate->order + PAGE_SHIFT); } +#else /* !CONFIG_HUGETLB_SIZE */ +#define kvm_vma_kernel_pagesize(v) PAGE_SIZE +#endif -#else +#else /* >= 2.6.32 */ #define kvm_vma_kernel_pagesize vma_kernel_pagesize